Changeset 407

Timestamp:

07/19/10 14:42:51 (14 years ago)

Author:

bas

Message:

changed self.DRY_RUN to self.parameters.dry_run

File:

• trunk/email2trac.py.in (modified) (11 diffs)

trunk/email2trac.py.in

@@ -191 +191 @@
                 self.setup_parameters()
 
-                self.DRY_RUN = parameters['dry_run']
+                self.DRY_RUN = parameters.dry_run
 
         def setup_log(self):
@@ -243 +243 @@
                         self.logger.setLevel(logging.INFO)
 
+                elif self.parameters.log_level in ['WARNING']:
+                        self.logger.setLevel(logging.WARNING)
+
                 elif self.parameters.log_level in ['ERROR']:
                         self.logger.setLevel(logging.ERROR)
@@ -250 +253 @@
 
                 else:
-                        self.logger.setLevel(logging.WARNING)
+                        self.logger.setLevel(logging.ERROR)
 
                 self.log_formatter = logging.Formatter(self.parameters.log_format)
@@ -606 +609 @@
                         body_file = os.path.join(self.TMPDIR, 'body.txt')
 
-                if self.DRY_RUN:
+                if self.parameters.dry_run:
                         print 'DRY-RUN: not saving body to %s' %(body_file)
                         return
@@ -654 +657 @@
                         self.print_unicode(s)
 
-                        if self.DRY_RUN:
+                        if self.parameters.dry_run:
                                 print 'DRY_RUN: NOT saving attachments'
                                 continue
@@ -683 +686 @@
                         msg_file = os.path.join(self.TMPDIR, 'msg.txt')
 
-                if self.DRY_RUN:
+                if self.parameters.dry_run:
                         print 'DRY_RUN: NOT saving email message to %s' %(msg_file)
                 else:
@@ -1032 +1035 @@
 
                 if body_text.strip() or update_fields or self.properties: 
-                        if self.DRY_RUN:
+                        if self.parameters.dry_run:
                                 print 'DRY_RUN: tkt.save_changes(self.author, body_text, ticket_change_number) ', self.author, cnum
                         else:
@@ -1228 +1231 @@
                 when = datetime.now(utc)
 
-                if not self.DRY_RUN:
+                if not self.parameters.dry_run:
                         self.id = tkt.insert()
         
@@ -1260 +1263 @@
 
                 if changed:
-                        if self.DRY_RUN:
+                        if self.parameters.dry_run
                                 print 'DRY_RUN: tkt.save_changes(%s, comment) real reporter = %s' %( tkt['reporter'], self.author)
                         else:
@@ -1276 +1279 @@
                 self.logger.info('function attach_attachments()')
 
-                if self.DRY_RUN:
+                if self.parameters.dry_run:
                         print "DRY_RUN: no attachments attached to tickets"
                         return ''
@@ -2122 +2125 @@
                 self.logger.info('function notify()')
 
-                if self.DRY_RUN:
+                if self.parameters.dry_run:
                                 print 'DRY_RUN: self.notify(tkt, True) reporter = %s' %tkt['reporter']
                                 return