X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fmail-big-homedirs;h=f94e836fbd6e43e1b80248091b15f81a49e51271;hb=544ff05b30afca00887891d40300e37734c97498;hp=9c3fa021eb2fd3bba8bdd037dbddf238fd6454f9;hpb=e2590bc14b8db514cf8f9806ade04dbf572ec986;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/files/mail-big-homedirs b/modules/porterbox/files/mail-big-homedirs
index 9c3fa021e..f94e836fb 100755
--- a/modules/porterbox/files/mail-big-homedirs
+++ b/modules/porterbox/files/mail-big-homedirs
@@ -24,8 +24,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from __future__ import print_function
-
 from collections import defaultdict
 import email
 import email.mime.text
@@ -59,7 +57,7 @@ CRITERIA = [
     { 'size':  1024,  'notifyafter': 10}, #, 'deleteafter':  50 },
     { 'size':   100,  'notifyafter': 30}, #, 'deleteafter':  90 },
     { 'size':    20,  'notifyafter': 90}, #, 'deleteafter': 150 },
-    { 'size':     5,  'notifyafter':  0,    'deleteafter': 450 }
+    { 'size':     5,                        'deleteafter': 450 }
   ]
 EXCLUDED_USERNAMES = ['lost+found']
 MAIL_FROM = 'debian-admin (via Cron) <bulk@admin.debian.org>'
@@ -181,7 +179,7 @@ class HomedirReminder(object):
 
     for username, homedir_size in self.homedir_sizes.iteritems():
       try:
-        realname = pwd.getpwnam(username).pw_gecos.decode('utf-8').split(',', 1)[0].split(',', 1)[0]
+        realname = pwd.getpwnam(username).pw_gecos.decode('utf-8').split(',', 1)[0]
       except:
         realname = username
       lastlog_time = self.lastlog_times[username]