diff -u duplicity-0.6.18/debian/changelog duplicity-0.6.18/debian/changelog --- duplicity-0.6.18/debian/changelog +++ duplicity-0.6.18/debian/changelog @@ -1,3 +1,13 @@ +duplicity (0.6.18-0ubuntu3.3) precise-proposed; urgency=low + + * debian/patches/10fixignoremissing.dpatch + - Fix a utility function that tried to ignore missing files, but + didn't. Also fixed not try to handle non-OSError exceptions + Fixes a possible crasher. (LP: #1216921) + Patch by Matthias Witte. + + -- Louis Bouchard Fri, 13 Sep 2013 16:17:18 +0200 + duplicity (0.6.18-0ubuntu3.2) precise; urgency=low * debian/patches/09tmpdirfix.dpatch: diff -u duplicity-0.6.18/debian/patches/00list duplicity-0.6.18/debian/patches/00list --- duplicity-0.6.18/debian/patches/00list +++ duplicity-0.6.18/debian/patches/00list @@ -7,0 +8 @@ +10fixignoremissing only in patch2: unchanged: --- duplicity-0.6.18.orig/debian/patches/10fixignoremissing.dpatch +++ duplicity-0.6.18/debian/patches/10fixignoremissing.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10fixignoremissing.dpatch by Louis Bouchard +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix for LP: #1216921 - util.ignore_missing() does not work + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' duplicity-0.6.18~/duplicity/util.py duplicity-0.6.18/duplicity/util.py +--- duplicity-0.6.18~/duplicity/util.py 2012-02-29 20:24:04.000000000 +0100 ++++ duplicity-0.6.18/duplicity/util.py 2013-09-13 15:40:45.959544964 +0200 +@@ -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