duplicity-team team mailing list archive

[Michael Terry <michael.terry@xxxxxxxxxxxxx>]

Michael Terry has proposed merging lp:~mterry/duplicity/ignore-missing into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)
Related bugs:
  Bug #1216921 in Duplicity: "util.ignore_missing() does not work"
  https://bugs.launchpad.net/duplicity/+bug/1216921

For more details, see:
https://code.launchpad.net/~mterry/duplicity/ignore-missing/+merge/185273

Fix util.ignore_missing to actually work.

Spotted by Matthias Witte in bug 1216921, ignore_missing() does not actually work.  I confirmed the problem and the fix he wrote.
-- 
https://code.launchpad.net/~mterry/duplicity/ignore-missing/+merge/185273
Your team duplicity-team is requested to review the proposed merge of lp:~mterry/duplicity/ignore-missing into lp:duplicity.

=== modified file 'duplicity/util.py'
--- duplicity/util.py	2012-01-20 21:50:01 +0000
+++ duplicity/util.py	2013-09-12 14:25:24 +0000
@@ -114,9 +114,10 @@
     """
     try:
         fn(filename)
-    except Exception:
-        type, value, tb = sys.exc_info() #@UnusedVariable
-        if isinstance(type, OSError) and value[0] == errno.ENOENT:
+    except OSError, ex:
+        if ex.errno == errno.ENOENT:
             pass
+        else:
+            raise
+    else:
         raise
-