Changeset 99

Timestamp:

07/13/06 14:39:25 (18 years ago)

Author:

bas

Message:

EmailtoTracScript?:

delete_spam.py.in:

• Fixed several erros

Location:

emailtotracscript/trunk

Files:

• ChangeLog (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• delete_spam.py.in (modified) (2 diffs)

emailtotracscript/trunk/ChangeLog

@@ -12 +12 @@
           Fixed by: Bas van der Vlies
 
+        * delete_spam.py 
+           - did not clean up the attachment table. So we got nasty new 
+             mails with fake attachments.
+           - It works now for versions higher then 0.8
+        
 2006-07-06
         * Fixed an error in already added attachments. Do not close

emailtotracscript/trunk/debian/changelog

@@ +1 @@
+email2trac (0.7.6-2) stable; urgency=low
+
+  * Fixed delete_spam.py for versions higher then 0.8
+
+ -- Bas van der Vlies <basv@sara.nl>  Thu, 13 Jul 2006 14:28:55 +0200
+
+email2trac (0.7.6-1) stable; urgency=low
+
+  * Fixes delete_spam.py also delete from attachment table
+    Fixes: Jaap Dijkshoorn
+
+ -- root <root@rc.sara.nl>  Thu, 13 Jul 2006 12:33:41 +0200
+
 email2trac (0.7.5-1) stable; urgency=low
 

emailtotracscript/trunk/delete_spam.py.in

@@ -79 +79 @@
                         env = Environment(project, create=0)
                         db = env.get_db_cnx()
-                        
+
+                        attachment_dir = os.path.join(env.path, 'attachments', 'ticket')
+
                         cursor = db.cursor()
 
@@ -90 +92 @@
                                         break
                                 spam_id =  row[0]
-                                attachment_dir = os.path.join(env.get_attachments_dir(), 'ticket', str(spam_id)) 
-                                if os.path.exists(attachment_dir):
+
+                                sql_cmd = "DELETE FROM attachment WHERE type='ticket' and id='%s';" %spam_id
+                                cursor.execute(sql_cmd) 
+
+                                dir = os.path.join(attachment_dir, str(spam_id)) 
+                                if os.path.exists(dir):
                                         if debug:
-                                                print 'delete %s : %s' %(spam_id, attachment_dir)
+                                                print 'delete %s : %s' %(spam_id, dir)
                                         try:
-                                                shutil.rmtree(attachment_dir)
+                                                shutil.rmtree(dir)
                                         except OSError, detail:
                                                 print 'Contact system-administrator: %s' %detail