summaryrefslogtreecommitdiff
path: root/Debian/Debhelper
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-02-16 14:52:06 -0500
committerJoey Hess <joey@gnu.kitenet.net>2010-02-16 14:52:06 -0500
commit989b3dce4d4d273f609395fa0daa08839e2bd312 (patch)
tree0a8b21f3409a587acea3e13f76a94035ac81d48b /Debian/Debhelper
parentbaeac7053c85dcd8345aeeff9dd7d9b9a02e4ba2 (diff)
dh: Disable option bundling to avoid mis-parsing bundled options such as "-Bpython-support". Closes: #570039
Diffstat (limited to 'Debian/Debhelper')
-rw-r--r--Debian/Debhelper/Dh_Getopt.pm9
1 files changed, 4 insertions, 5 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index f5364870..f3649fc2 100644
--- 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