From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 18 Jan 2014 23:35:19 +0000 (+0000)
Subject: Do not report the (irrelevant) $? when madison parsing fails.
X-Git-Tag: debian/0.21~9
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6ac74a9d56fdc86b30c4e7940734cd95be6840c4;hp=00ff2e329bed2f77e314381835e3518954ad89d4;p=dgit.git

Do not report the (irrelevant) $? when madison parsing fails.
---

diff --git a/debian/changelog b/debian/changelog
index 6080f8ff..aaf0ead3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (0.21~~iwj) unstable; urgency=low
 
   * Use failedcmd to report errors when ssh psql fails.  Closes:#734281.
+  * Do not report the (irrelevant) $? when madison parsing fails.
   * Add `Testsuite: autopkgtest' to debian/control.  (This will only have
     the right effect with recent enought dpkg, and will generate a warning
     with earlier versions of dpkg.
diff --git a/dgit b/dgit
index 94454d33..19d6b011 100755
--- a/dgit
+++ b/dgit
@@ -636,7 +636,7 @@ sub madison_parse ($) {
 	$l =~ m{^ \s*( [^ \t|]+ )\s* \|
                   \s*( [^ \t|]+ )\s* \|
                   \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
-                  \s*( [^ \t|]+ )\s* }x or die "$rmad $?";
+                  \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
 	$1 eq $package or die "$rmad $package ?";
 	my $vsn = $2;
 	my $newsuite = $3;