Merge tag 'v4.26' into develop

bugfix mail processing
2017-10-15 08:45:32 +02:00
parent e3876ec85d b195c2bb70
commit 5d24f1c845
1 changed files with 5 additions and 3 deletions
--- a/rowers/management/commands/processemail.py
+++ b/rowers/management/commands/processemail.py
@@ -139,10 +139,12 @@ class Command(BaseCommand):
                    except:
                        pass

-
+            try:
+                a.delete()
+            except IOError:
+                pass
            # remove attachment
-	    if donotdelete == 0:
-		a.delete()
+	    #if donotdelete == 0:

 	    if m.attachments.exists()==False:
 		# no attachments, so can be deleted