Merge lp:~mterry/duplicity/ignore-missing into lp:duplicity/0.6

[Michael Terry]

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.

[lp:~mterry/duplicity/ignore-missing]

928. By Michael Terry on 2013-09-12

Fix else: to be except Exception:

929. By Michael Terry on 2013-09-12

Or better yet, just drop the stanza, it shouldn't be needed

[Michael Terry (mterry)]

Looks like you landed part of this, but not all of it. You need my further fixes to the patch to fix the test failures.

=== modified file 'duplicity/util.py'
--- duplicity/util.py	2012-01-20 21:50:01 +0000
+++ duplicity/util.py	2013-09-12 15:11:23 +0000
@@ -114,9 +114,8 @@
     """
     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
-        raise
-
+        else:
+            raise