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) precise; urgency=low
+
+  * debian/patches/06lazywarnings.dpatch:
+    - Backport patch to add some more machine-readable warning codes
+      for when duplicity can't restore a particular file.  This lets
+      apps like deja-dup present the user with a list of files with
+      problems.
+
+ -- Michael Terry <mterry@ubuntu.com>  Thu, 22 Mar 2012 09:24:58 -0400
+
 duplicity (0.6.18-0ubuntu2) precise; urgency=low
 
   * debian/control:
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
@@ -3,0 +4 @@
+06lazywarnings
only in patch2:
unchanged:
--- duplicity-0.6.18.orig/debian/patches/06lazywarnings.dpatch
+++ duplicity-0.6.18/debian/patches/06lazywarnings.dpatch
@@ -0,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06lazywarnings.dpatch by Michael Terry <michael.terry@canonical.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add a few more warning codes (patch from bzr)
+
+@DPATCH@
+diff -urNad duplicity-0.6.18~/duplicity/lazy.py duplicity-0.6.18/duplicity/lazy.py
+--- duplicity-0.6.18~/duplicity/lazy.py	2010-07-22 19:15:11 +0000
++++ duplicity-0.6.18/duplicity/lazy.py	2012-03-22 02:45:58 +0000
+@@ -397,7 +397,9 @@
+             filename = os.path.join(*self.index)
+         else:
+             filename = "."
+-        log.Warn(_("Error '%s' processing %s") % (exc, filename))
++        log.Warn(_("Error '%s' processing %s") % (exc, filename),
++                 log.WarningCode.cannot_process,
++                 util.escape(filename))
+ 
+     def log_prev_error(self, index):
+         """Call function if no pending exception"""
+@@ -405,8 +407,11 @@
+             index_str = "."
+         else:
+             index_str = os.path.join(*index)
+-        log.Warn(_("Skipping %s because of previous error") % index_str)
++        log.Warn(_("Skipping %s because of previous error") % index_str,
++                 log.WarningCode.process_skipped,
++                 util.escape(index_str))
+ 
+ 
+ from duplicity import log
+ from duplicity import robust
++from duplicity import util
+
+diff -urNad duplicity-0.6.18~/duplicity/log.py duplicity-0.6.18/duplicity/log.py
+--- duplicity-0.6.18~/duplicity/log.py	2012-02-29 13:35:03 +0000
++++ duplicity-0.6.18/duplicity/log.py	2012-03-22 02:45:58 +0000
+@@ -137,6 +137,8 @@
+     cannot_stat = 9
+     cannot_read = 10
+     no_sig_for_time = 11
++    cannot_process = 12
++    process_skipped = 13
+ 
+ def Warn(s, code=WarningCode.generic, extra=None):
+     """Shortcut used for warning messages (verbosity 2)"""
+