Dpkg::BuildOptions: Parse all options in DEB_BUILD_OPTIONS

This will preserve unrecognized options when calling dpkg-buildpackage
with -j.

diff --git a/ChangeLog b/ChangeLog
index f17e20f1c97566b861434c8a71a3ff5673fbc517..eeb174bd2da9a492c752dc4c9dc34e659fced322 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-07  Guillem Jover  <guillem@debian.org>
+
+       * scripts/Dpkg/BuildOptions.pm (set): Parse all options separated
+       by spaces or comma, do not lowercase the option names, do not match
+       on name substrings, and on recognized options with invalid values
+       discard the value or the entire option.
+       * scripts/t/300_Dpkg_BuildOptions.t: Adjust test suite.
+
 2008-01-06  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/Dpkg/Shlibs/Objdump.pm: Also retrieve dynamic relocation

diff --git a/debian/changelog b/debian/changelog
index ae3f8b320471f0d89dfe9dc66910309a5dc633e6..0753382108fcbd0753a43dd79ad78526636ab0f5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,8 @@ dpkg (1.14.15) UNRELEASED; urgency=low
   * Add lzma to dpkg-dev Depends.
   * Do not automatically enable -j if DEB_BUILD_OPTIONS contains parallel=n,
     and allow overriding its value from the environment. Closes: #458589
+  * Fix Dpkg::BuildOptions to parse all options in DEB_BUILD_OPTIONS, so
+    that dpkg-buildpackage called with -j preserves unrecognized options.
 
   [ Updated dpkg translations ]
   * Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918, #458732

diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index 39f1099707ef9f66d404acea58eaf55889cd4ac6..1068248fe2139e46f1f9cfd3547803ab4c1969ac 100644 (file)
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -11,11 +11,23 @@ sub parse {
     unless ($env) { return {}; }
 
     my %opts;
-    while ($env =~ s/(noopt|nostrip|nocheck),?//i) {
-       $opts{lc $1} = '';
-    }
-    while ($env =~ s/(parallel)=(-?\d+),?//i) {
-       $opts{lc $1} = $2;
+
+    foreach (split(/[\s,]+/, $env)) {
+       # FIXME: This is pending resolution of Debian bug #430649
+       /^([a-z][a-z0-9_-]*)(=(\w*))?$/;
+
+       my ($k, $v) = ($1, $3 || '');
+
+       # Sanity checks
+       if (!$k) {
+           next;
+       } elsif ($k =~ /^(noopt|nostrip|nocheck)$/ && length($v)) {
+           $v = '';
+       } elsif ($k eq 'parallel' && $v !~ /^-?\d+$/) {
+           next;
+       }
+
+       $opts{$k} = $v;
     }
 
     return \%opts;

diff --git a/scripts/t/300_Dpkg_BuildOptions.t b/scripts/t/300_Dpkg_BuildOptions.t
index 9a5baf37607d3793f330ed5dcc6872c776fdd8c6..7dc8394f353cb6b6d22c8e022eb4035081b5c1bd 100644 (file)
--- a/scripts/t/300_Dpkg_BuildOptions.t
+++ b/scripts/t/300_Dpkg_BuildOptions.t
@@ -7,16 +7,19 @@ use warnings;
 
 use_ok('Dpkg::BuildOptions');
 
-$ENV{DEB_BUILD_OPTIONS} = 'foonostripbar,parallel=3,bazNOCHECK';
+$ENV{DEB_BUILD_OPTIONS} = 'noopt,foonostripbar,parallel=3,bazNOCHECK';
 
 my $dbo = Dpkg::BuildOptions::parse();
 
 my %dbo = (
-          nostrip => '',
-          nocheck => '',
+          noopt => '',
+          foonostripbar => '',
           parallel => 3,
           );
 my %dbo2 = (
+           no => '',
+           opt => '',
+           'no-strip' => '',
            nocheck => '',
           );