SF.net SVN: safekeep:[829] safekeep/trunk/safekeep

[<fcr...@us...>]

Revision: 829
          http://safekeep.svn.sourceforge.net/safekeep/?rev=829&view=rev
Author:   fcrawford
Date:     2012-12-29 09:33:33 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Better handling of noemail option.

Modified Paths:
--------------
    safekeep/trunk/safekeep

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2012-12-29 08:41:06 UTC (rev 828)
+++ safekeep/trunk/safekeep	2012-12-29 09:33:33 UTC (rev 829)
@@ -1931,19 +1931,22 @@
             base_dir = props['base.dir']
         if 'client.user' in props:
             client_user = props['client.user']
-        for prop in [prop for prop in props if prop.startswith('email.')]:
-            if not noemail and prop == 'email.to':
-                email['to'] = props[prop].split(',')
-            elif prop == 'email.format':
-                email['format'] = props[prop]
-                if email['format'] not in ('text', 'html'):
-                    error('CONFIG ERROR: invalid email format type: %s' % email['format'])
-                    sys.exit(2)
-            elif prop == 'email.summary':
-                if props[prop].lower() in ('true', 'yes', 1):
-                    email['summary'] = props[prop]
-            else:
-                email[prop.split('.')[1]] = props[prop]
+        if not noemail:
+            for prop in [prop for prop in props if prop.startswith('email.')]:
+                if not noemail and prop == 'email.to':
+                    email['to'] = props[prop].split(',')
+                elif prop == 'email.format':
+                    email['format'] = props[prop]
+                    if email['format'] not in ('text', 'html'):
+                        error('CONFIG ERROR: invalid email format type: %s' % email['format'])
+                        sys.exit(2)
+                elif prop == 'email.summary':
+                    if props[prop].lower() in ('true', 'yes', 1):
+                        email['summary'] = props[prop]
+                else:
+                    email[prop.split('.')[1]] = props[prop]
+        else:
+            email = {}
         nice_def = get_int('nice.adjustment')
         if nice_def is None: nice_def = 10
         nice_srv = get_int('nice.adjustment.server') or nice_def

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.