duplicity-team team mailing list archive

[Michael Terry <michael.terry@xxxxxxxxxxxxx>]

Michael Terry has proposed merging lp:~mterry/duplicity/partial-encryption into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)
Related bugs:
  Bug #838264 in Duplicity: "Duplicity thinks partial encrypted backups are not encrypted"
  https://bugs.launchpad.net/duplicity/+bug/838264

For more details, see:
https://code.launchpad.net/~mterry/duplicity/partial-encryption/+merge/73566

See bug 838264 for background info.

This branch allows upgrading a partial chain's info if it turns out that its files are really encrypted.  I'm not 100% it's safe, but it seems reasonable.  A more experience eye would be helpful.

It only allows upgrading encryption status of partial chains to True.  Otherwise, if the encryption states don't match, it rejects the filename (which is new behavior).
-- 
https://code.launchpad.net/~mterry/duplicity/partial-encryption/+merge/73566
Your team duplicity-team is requested to review the proposed merge of lp:~mterry/duplicity/partial-encryption into lp:duplicity.

=== modified file 'duplicity/collections.py'
--- duplicity/collections.py	2011-08-21 00:00:56 +0000
+++ duplicity/collections.py	2011-08-31 17:49:27 +0000
@@ -85,6 +85,11 @@
             if (pr.start_time != self.start_time or
                 pr.end_time != self.end_time):
                 return False
+            if pr.encrypted != self.encrypted:
+                if self.partial and pr.encrypted:
+                    self.encrypted = pr.encrypted
+                else:
+                    return False
 
         if pr.manifest:
             self.set_manifest(filename)