From: Stephen Gran <steve@lobefin.net>
Date: Tue, 14 Jan 2014 08:31:41 +0000 (+0000)
Subject: and fix errors
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=69a703f54568a0ac4e397adffe2466254340fbbc;p=mirror%2Fdsa-puppet.git

and fix errors

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/porterbox/files/mail-big-homedirs b/modules/porterbox/files/mail-big-homedirs
index d5277aef4..98774fe8e 100755
--- a/modules/porterbox/files/mail-big-homedirs
+++ b/modules/porterbox/files/mail-big-homedirs
@@ -194,9 +194,10 @@ class HomedirReminder(object):
 
   def run(self):
     current_time = time.time()
+    conn = None
     try:
       data = {}
-      for user in set(self.homedir_sizes.keys()) +
+      for user in set(self.homedir_sizes.keys()) | \
                   set(self.lastlog_times.keys()):
         data[user] = {
           'homedir': self.homedir_sizes.get(user, 0),
@@ -214,7 +215,7 @@ class HomedirReminder(object):
                       exchange_name=config.exchange,
                       timeout=5)
     except Exception, e:
-      LOG.error("Error sending: %s" % e)
+      logging.error("Error sending: %s" % e)
     finally:
       if conn:
         conn.close()