Merge lp:~mterry/duplicity/delete-new-sig-in-cache into lp:duplicity/0.6

[Michael Terry]

In duplicity 0.6.20, we fixed bug 1031269. This means that we no longer leave sig files on the remote location.

Leaving sig files on the remote location also caused a bug with deleting cache files. Code used to leave remote new-sig but delete the locale cache new-sig; this meant that we would keep downloadoing the new-sig all the time from remote. We had worked around that by just not deleting the new-sig in the cache, which was sort of the wrong side of that problem to tackle.

Now that we handle the remote new-sigs better (by deleting them), I don't think we need this code anymore. Patch by <email address hidden>.

=== modified file 'duplicity/collections.py'
--- duplicity/collections.py	2012-09-19 17:29:46 +0000
+++ duplicity/collections.py	2012-11-03 21:47:18 +0000
@@ -151,12 +151,7 @@
             if (pr
                 and pr.time == self.time
                 and pr.start_time == self.start_time
-                and pr.end_time == self.end_time
-                and pr.type != "new-sig" ):
-                # do not remove new sigs from the cache:
-                # they aren't removed from the remote archive,
-                # and subsequent backups will have to resync
-                # which is bad if running non-interactive with encrypt-key
+                and pr.end_time == self.end_time):
                 try:
                     globals.archive_dir.append(lfn).delete()
                 except Exception: