diff options
| author | Guido Günther <agx@sigxcpu.org> | 2014-05-19 12:06:08 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2014-05-19 12:12:22 +0200 |
| commit | de77df731cd752a9d26c8bef7cf9933f30bfb50a (patch) | |
| tree | bf7afc191fb1042d491e4830cb0c556be78f6935 | |
| parent | dc231f2e75fe8733df35433be6455aeefcc47a44 (diff) | |
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
| -rwxr-xr-x | gbp/scripts/pq.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |