Changeset 201 for trunk

Timestamp:

05/27/08 14:10:55 (16 years ago)

Author:

bas

Message:

email2trac.py.in:

• added new option -n/--dry-run
• changed layaout a bit

File:

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

trunk/email2trac.py.in

@@ -107 +107 @@
 trac_default_version = '0.10'
 m = None 
+DRY_RUN = False
 
 
@@ -520 +521 @@
                                         ticket[field] = value
                                         
-                                
-                                
         def ticket_update(self, m):
                 """
@@ -618 +617 @@
                 tkt['version'] = self.get_config('ticket', 'default_version')
 
+                tkt['type'] = self.get_config('ticket', 'default_type')
+                if settings.has_key('component'):
+                        tkt['component'] = settings['component']
+                else:
+                        tkt['component'] = self.get_config('ticket', 'default_component')
+                        tkt['component'] = component
+
                 if not msg['Subject']:
                         tkt['summary'] = u'(No subject)'
@@ -623 +629 @@
                         tkt['summary'] = self.email_to_unicode(msg['Subject'])
 
-                if settings.has_key('component'):
-                        tkt['component'] = settings['component']
-                else:
-                        tkt['component'] = component
 
                 # Set default owner for component, HvB
                 # Is not necessary, because if component is set. The trac code
-                # will find the owner: self.set_owner(tkt)
-                #
+                # will find the owner: 
+                #
+                # self.set_owner(tkt)
+
                 self.set_reply_fields(tkt, msg)
 
@@ -650 +654 @@
                 when = datetime.now(utc)
 
-                ticket_id = tkt.insert()
-                #try:
-                #       ticket_id = tkt.insert()
-                #except OperationalError, detail:
-                #       syslog.openlog('email2trac', syslog.LOG_NOWAIT)
-                #       syslog.syslog('catch tkt insert problem %s' %detail)
-                #       syslog.closelog()
-                #
-                #       ticket_id = tkt.insert()
+                if DRY_RUN:
+                        ticket_id = 'DRY_RUN'
+                else:
+                        ticket_id = tkt.insert()
                         
                 tkt['id'] = ticket_id
@@ -680 +679 @@
 
                 if changed:
-                        tkt.save_changes(self.author, comment)
-                        #print tkt.get_changelog(self.db, when)
+                        if DRY_RUN:
+                                print 'DRY_RUN: tkt.save_changes(self.author, comment)'
+                        else:
+                                tkt.save_changes(self.author, comment)
+                                #print tkt.get_changelog(self.db, when)
 
                 if self.notification:
@@ -1051 +1053 @@
         component = ''
         ENABLE_SYSLOG = 0
+
+        SHORT_OPT = ''chf:np:'
+        LONG_OPT  =  ['component=', 'dry-run', 'help', 'file=', 'project=']
+
+        global DRY_RUN
                 
         try:
-                opts, args = getopt.getopt(sys.argv[1:], 'chf:p:', ['component=','help', 'file=', 'project='])
+                opts, args = getopt.getopt(sys.argv[1:], SHORT_OPT, LONG_OPT)
         except getopt.error,detail:
                 print __doc__
@@ -1068 +1075 @@
                 elif opt in ['-f', '--file']:
                         configfile = value
+                elif opt in ['-n', '--dry-run']:
+                        DRY_RUN = True
                 elif opt in ['-p', '--project']:
                         project_name = value