From: Frank Lichtenheld <djpig@debian.org>
Date: Fri, 28 Sep 2007 00:46:31 +0000 (+0200)
Subject: dpkg-buildpackage: Handle an empty rootcommand correctly
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=669ab06759db350765ac751cb52f487ea3418b7f;p=dpkg

dpkg-buildpackage: Handle an empty rootcommand correctly

(withecho): Remove empty strings at the begin of the command array.
These can be caused by e.g. an emtpy $rootcommando. It is easiest to
filter them out here.
---

diff --git a/ChangeLog b/ChangeLog
index 30375cbc..e2f29810 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-28  Frank Lichtenheld  <djpig@debian.org>
+
+	* scripts/dpkg-buildpackage.pl (withecho): Remove
+	empty strings at the begin of the command array.
+	These can be caused by e.g. an emtpy $rootcommando.
+	It is easiest to filter them out here.
+
 2007-09-24  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-buildpackage.pl (signfile): Do not use absolute path
diff --git a/debian/changelog b/debian/changelog
index dca92608..262a0d6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ dpkg (1.14.7) UNRELEASED; urgency=low
   [ Frank Lichtenheld ]
   * Add _MTN to dpkg-source -i default regex. Suggested by Jari Aalto.
   * Convert dpkg-buildpackage to a Perl script.
+    Fix some bugs in the new script detected in experimental:
+    Closes: #444362
   * dpkg-buildpackage accepts a -j<n> option now which will set
     MAKEFLAGS(-j<n>) and DEB_BUILD_OPTIONS(parallel=<n>) accordingly.
     parallel=<n> in DEB_BUILD_OPTIONS will be passed to MAKEFLAGS as
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index c7cd4229..73beaced 100644
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -320,6 +320,7 @@ sub signfile {
 
 
 sub withecho {
+    shift while !$_[0];
     print STDERR " @_\n";
     system(@_)
 	and subprocerr("@_");