Ticket #446: patch_2.patch

email2trac

@@ -1131 +1131 @@
                 tkt.save_changes(self.author, body_text, when, None, str(cnum))
 
         if not spam:
-            if self.parameters.use_trac_notification
+            if self.parameters.use_trac_notification:
                 # use trac native notification system
                 event = TicketChangeEvent( 'changed', tkt, when, self.author, 'email2trac' )
                 NotificationSystem( self.env ).notify( event )
@@ -1397 +1397 @@
                 tkt.save_changes(tkt['reporter'], comment)
 
         if not spam:
-            if self.parameters.use_trac_notification
+            if self.parameters.use_trac_notification:
                 # use trac native notification system
                 event = TicketChangeEvent( 'changed', tkt, when, self.author, 'email2trac' )
                 NotificationSystem( self.env ).notify( event )
@@ -1823 +1823 @@
             self.save_email_for_debug(m, self.parameters.project_name, True)
 
         #self.db = self.env.get_read_db()
-        self.db = self.env.db_query()
+        #self.db = self.env.db_query()
+        with self.env.db_query as db:
+            self.logger.debug('Main function parse: type(db) = [%s]' %( type(db) ) )
 
         self.get_sender_info(m)
 
@@ -2917 +2920 @@
 
             settings.use_trac_notification = False
 
-        elif version in  [ '1.3', '1.4' ]
+        elif version in  [ '1.3', '1.4' ]:
 
             from trac import attachment
             from trac import config as trac_config