Michael Terry has proposed merging lp:~mterry/duplicity/rbNoneNone into
lp:duplicity.
Requested reviews:
duplicity-team (duplicity-team)
Related bugs:
Bug #835892 in Duplicity: "duplicity crash: "AssertionError: rb None None""
https://bugs.launchpad.net/duplicity/+bug/835892
For more details, see:
https://code.launchpad.net/~mterry/duplicity/rbNoneNone/+merge/78127
Don't try to open a sig_path object if it isn't regular.
I'm not sure yet in what situations this can occur (seems to be related to a
directory becoming a regular file), but I have a dataset that reproduces bug
835892 and this branch fixes the exception.
--
https://code.launchpad.net/~mterry/duplicity/rbNoneNone/+merge/78127
Your team duplicity-team is requested to review the proposed merge of
lp:~mterry/duplicity/rbNoneNone into lp:duplicity.
=== modified file 'duplicity/diffdir.py'
--- duplicity/diffdir.py 2011-06-13 15:40:19 +0000
+++ duplicity/diffdir.py 2011-10-04 17:07:26 +0000
@@ -121,7 +121,7 @@
ti.name = "signature/" + "/".join(index)
sigTarFile.addfile(ti, cStringIO.StringIO(sig_string))
- if new_path.isreg() and sig_path and sig_path.difftype == "signature":
+ if new_path.isreg() and sig_path and sig_path.isreg() and sig_path.difftype == "signature":
delta_path.difftype = "diff"
old_sigfp = sig_path.open("rb")
newfp = FileWithReadCounter(new_path.open("rb"))
_______________________________________________
Mailing list: https://launchpad.net/~duplicity-team
Post to : [email protected]
Unsubscribe : https://launchpad.net/~duplicity-team
More help : https://help.launchpad.net/ListHelp
