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 30375cbcc757955257ce10fecfab8d080032d618..e2f29810fb3d6a84eaf7563f13478028bec5cb62 100644 (file)
--- 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 dca92608f2d0eb785ba5e1bcfcc1a5bf048f1be0..262a0d6b684a1ee29f7a5cb4a6e383fe4cc42305 100644 (file)
--- 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 c7cd422983a4bff9ba70cff8b0142f91fde44ce0..73beaced85d0be231aa7ebdbf568de43e14fb397 100644 (file)
--- 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("@_");