dgit: git-debrebase interop: Actually tolerate git-debrebase status 7

make-patches exiting with status 7 causes $?==7*256, not 7.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 8f093d445af02c1b6e0736441c79ccfe64ccd58f..009e19fb84b0597cbc7ba06d6cfef2ce78552d21 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ dgit (5.2~) unstable; urgency=medium
   * Print a warning to stderr on `dgit fetch sid', if your vcs-git
     remote url disagrees with what's in sid's .dsc.
   * git-debrebase interop: Add a missing debugcmd debugging print.
+  * git-debrebase interop: Actually tolerate git-debrebase make-patches
+    exiting with status 7.
 
   test suite:
   * Use nproc(1) rather than Sys::CPU.  This is more portable and does not

diff --git a/dgit b/dgit
index 88db243261790717921deba420dea1ff3ff390cc..5c9cdc3e2a8d24819199c69d4f61b4735a18d78f 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -5571,7 +5571,7 @@ END
        if (act_local()) {
            debugcmd "+",@cmd;
            $!=0; $?=-1;
-           failedcmd @cmd if system @cmd and $?!=7;
+           failedcmd @cmd if system @cmd and $?!=7*256;
        } else {
            dryrun_report @cmd;
        }