dh: Disable option bundling to avoid mis-parsing bundled options such as "-Bpython...

diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index f5364870cf20afa4558c6aa1baa9fef4934f1c04..f3649fc21b7040ff74a448ba61fbde7800080a2c 100644 (file)
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -70,6 +70,10 @@ sub getoptions {
        my $array=shift;
        my %params=@_;
 
+       if (! exists $params{bundling} || $params{bundling}) {
+               Getopt::Long::config("bundling");
+       }
+
        my @test;
        my %options=(   
                "v" => \$dh{VERBOSE},
@@ -276,9 +280,4 @@ sub parseopts {
        @ARGV=@{$dh{ARGV}} if exists $dh{ARGV};
 }
 
-sub import {
-       # Enable bundling of short command line options.
-       Getopt::Long::config("bundling");
-}              
-
 1

diff --git a/debian/changelog b/debian/changelog
index 29c1a2e7a4f4ac84016d83d259f458404b2f8479..77f1844d502085e47457247f040151f5dfe66199 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (7.4.14) unstable; urgency=low
+
+  * dh: Disable option bundling to avoid mis-parsing bundled options such
+    as "-Bpython-support". Closes: #570039
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 16 Feb 2010 14:47:10 -0500
+
 debhelper (7.4.13) unstable; urgency=low
 
   * dh_compress: Avoid compressing images in /usr/share/info. Closes: #567586

diff --git a/dh b/dh
index cf0baa563c925e07f391b7177dd98f7e4435e83b..2b60be5d4ffc701a45bb95ca01fff14f5fbffa2f 100755 (executable)
--- a/dh
+++ b/dh
@@ -246,6 +246,8 @@ init(options => {
        # Disable complaints about unknown options; they are passed on the
        # debhelper commands.
        ignore_unknown_options => 1,
+       # Bundling does not work well since there are unknown options.
+       bundling => 0,
 );
 inhibit_log();