The branch, master has been updated
       via  669ab06759db350765ac751cb52f487ea3418b7f (commit)
      from  db10948122b2f7df3530fe75d20b9df8e03b1c2b (commit)


- Shortlog ------------------------------------------------------------
669ab06 dpkg-buildpackage: Handle an empty rootcommand correctly

Summary of changes:
 ChangeLog                    |    7 +++++++
 debian/changelog             |    2 ++
 scripts/dpkg-buildpackage.pl |    1 +
 3 files changed, 10 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 669ab06759db350765ac751cb52f487ea3418b7f
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date:   Fri Sep 28 02:46:31 2007 +0200

    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 30375cb..e2f2981 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-28  Frank Lichtenheld  <[EMAIL PROTECTED]>
+
+       * 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  <[EMAIL PROTECTED]>
 
        * scripts/dpkg-buildpackage.pl (signfile): Do not use absolute path
diff --git a/debian/changelog b/debian/changelog
index dca9260..262a0d6 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 c7cd422..73beace 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("@_");

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to