Fix dpkg-buildpackage to not double options when called with -j option

* scripts/Dpkg/BuildOptions.pm (set): Change the default value of
the overwrite parameter to 1. The only use of this function in
dpkg-buildpackage is missing the parameter and actually wants to
overwrite the whole variable.
* scripts/t/300_Dpkg_BuildOptions.t: Adjust the test suite for this
change.

diff --git a/ChangeLog b/ChangeLog
index 14a228cfed3ad95e2841a65734e66839dbf162b7..f17e20f1c97566b861434c8a71a3ff5673fbc517 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,13 @@
        They are initialized by the loader with values searched in the
        needed libraries.
 
+       * scripts/Dpkg/BuildOptions.pm (set): Change the default value of
+       the overwrite parameter to 1. The only use of this function in
+       dpkg-buildpackage is missing the parameter and actually wants to
+       overwrite the whole variable.
+       * scripts/t/300_Dpkg_BuildOptions.t: Adjust the test suite for this
+       change.
+
 2008-01-04  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/Dpkg/Shlibs/SymbolFile.pm: Replace #DEPRECATED by

diff --git a/debian/changelog b/debian/changelog
index df3aaa0f8f4072cc447eb921832dbf4598b9064d..ae3f8b320471f0d89dfe9dc66910309a5dc633e6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ dpkg (1.14.15) UNRELEASED; urgency=low
   * Explain better the order in which postinst/prerm scripts are called
     between a package and its dependencies. Thanks to Nicolas François and
     Helge Kreutzmann for their suggestions. Closes: #379641
+  * Fix Dpkg::BuildOptions so that dpkg-buildpackage doesn't double all
+    options in DEB_BUILD_OPTIONS when called with the -j parameter.
+    Closes: #453656
 
   [ Guillem Jover ]
   * Move compression related variables to a new Dpkg::Compression module.

diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index 8be98ffa2f98e87080c2d75717885fef878bb684..39f1099707ef9f66d404acea58eaf55889cd4ac6 100644 (file)
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -23,6 +23,7 @@ sub parse {
 
 sub set {
     my ($opts, $overwrite) = @_;
+    $overwrite = 1 if not defined($overwrite);
 
     my $env = $overwrite ? '' : $ENV{DEB_BUILD_OPTIONS}||'';
     if ($env) { $env .= ',' }

diff --git a/scripts/t/300_Dpkg_BuildOptions.t b/scripts/t/300_Dpkg_BuildOptions.t
index bfd788fad88c1a542a56387501f7d54a36ee9de7..9a5baf37607d3793f330ed5dcc6872c776fdd8c6 100644 (file)
--- a/scripts/t/300_Dpkg_BuildOptions.t
+++ b/scripts/t/300_Dpkg_BuildOptions.t
@@ -37,5 +37,5 @@ is_deeply(Dpkg::BuildOptions::parse(), $dbo, 'set (env)');
 
 $ENV{DEB_BUILD_OPTIONS} = 'foobar';
 $dbo = { noopt => '' };
-$env = Dpkg::BuildOptions::set($dbo);
+$env = Dpkg::BuildOptions::set($dbo, 0);
 is($env, "foobar,noopt,", 'set (append)');