From: Guido Günther <agx@sigxcpu.org>
Date: Mon, 19 May 2014 10:06:08 +0000 (+0200)
Subject: pq: Print proper error message if we fail to apply the tree
X-Git-Tag: debian/0.6.14~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de77df731cd752a9d26c8bef7cf9933f30bfb50a;p=tools%2Fgit-buildpackage.git

pq: Print proper error message if we fail to apply the tree

e.g. instead of

gbp:error: Failed to apply 'debian/patches/poison+remember_trash'

we now have

gbp:error: Failed to apply 'debian/patches/poison+remember_trash': Failed to commit tree: fatal: invalid date format: 1998/03/21
---

diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py
index fc205bf2..05e5660c 100755
--- a/gbp/scripts/pq.py
+++ b/gbp/scripts/pq.py
@@ -174,8 +174,8 @@ def import_quilt_patches(repo, branch, series, tries, force):
             gbp.log.debug("Applying %s" % patch.path)
             try:
                 apply_and_commit_patch(repo, patch, maintainer, patch.topic)
-            except (GbpError, GitRepositoryError):
-                gbp.log.err("Failed to apply '%s'" % patch.path)
+            except (GbpError, GitRepositoryError) as e:
+                gbp.log.err("Failed to apply '%s': %s" % (patch.path, e))
                 repo.set_branch(branch)
                 repo.delete_branch(pq_branch)
                 break