|author||Ian Jackson <email@example.com>||2016-12-19 14:45:18 +0000|
|committer||Ian Jackson <firstname.lastname@example.org>||2016-12-19 16:58:57 +0000|
Produce better error reporting when absurd git wrapper fails on a patch
during .dsc import. Apropos of #848391. gbp swallows the error from the first run (without --whitespace=fix). Previously only that first run would do anything useful; the second would complain about --whitespace=fix. So failures of dpkg-source would always produce a useless error message. Instead, tolerate (and ignore) the --whitespace=fix option which gbp passes during the second run. This means that the second run tries to do the actual work. This only does extra work if the first run failed, and since the first and second runs are now equivalent, that happens when the second run fails too. But in return for that extra work, we get a report which actually mentions something that unexpectedly went wrong. (The alternative would be to have absurd/git try to stash and then reproduce its previous error, or to make more fragile assumptions about gbp's behaviour.) Signed-off-by: Ian Jackson <email@example.com>
2 files changed, 5 insertions, 0 deletions
@@ -56,6 +56,9 @@ for arg in "$@"; do
fail "UNKNOWN OPTION $arg ($*)"
diff --git a/debian/changelog b/debian/changelog
index bca0690..cdd7f25 100644
@@ -19,6 +19,8 @@ dgit (2.12~) unstable; urgency=medium
tag, even in non-split-view quilt modes. Closes:#844129.
* Do not fail when cloning a package containing dangling symlinks.
+ * Produce better error reporting when absurd git wrapper fails
+ on a patch during .dsc import. Apropos of #848391.
* Provide and use stunt lintian and debuild, to avoid lintian