Fix warning about unknown options passed to commands in override targets.

dh used DH_OVERRIDE_UNKNOWN_OPTIONS, which was too broad as it affected
commands run via override targets and caused there to be no warning about
unknown options.

Now unknown options are only ignored when parsing DH_INTERNAL_OPTIONS and
dh's own options.

1 files changed, 19 insertions, 19 deletions

diff --git a/dh b/dh
index c90cf0e2..96a6b84a 100755
--- a/dh
+++ b/dh
@@ -220,29 +220,29 @@ my @ARGV_orig=@ARGV;
 # (and comes first so python-central loads later and can disable it).
 unshift @ARGV, "--with=python-support";
 		
-# Disable complaints about unknown options for both dh and the commands
-# it runs. This is done because dh accepts and passes on options that may
-# be specific to only some debhelper commands.
-$ENV{DH_IGNORE_UNKNOWN_OPTIONS}=1;
-
 init(options => {
-	"until=s" => \$dh{UNTIL},
-	"after=s" => \$dh{AFTER},
-	"before=s" => \$dh{BEFORE},
-	"remaining" => \$dh{REMAINING},
-	"with=s" => sub {
-		my ($option,$value)=@_;
-		push @{$dh{WITH}},split(",", $value);
-	},
-	"without=s" => sub {
-		my ($option,$value)=@_;
-		@{$dh{WITH}} = grep { $_ ne $value } @{$dh{WITH}};
+		"until=s" => \$dh{UNTIL},
+		"after=s" => \$dh{AFTER},
+		"before=s" => \$dh{BEFORE},
+		"remaining" => \$dh{REMAINING},
+		"with=s" => sub {
+			my ($option,$value)=@_;
+			push @{$dh{WITH}},split(",", $value);
+		},
+		"without=s" => sub {
+			my ($option,$value)=@_;
+			@{$dh{WITH}} = grep { $_ ne $value } @{$dh{WITH}};
+		},
+		"l" => \$dh{LIST},
+		"list" => \$dh{LIST},
 	},
-	"l" => \$dh{LIST},
-	"list" => \$dh{LIST},
-});
+	# Disable complaints about unknown options; they are passed on the
+	# debhelper commands.
+	ignore_unknown_options => 1,
+);
 inhibit_log();
 
+
 # If make is using a jobserver, but it is not available
 # to this process, clean out MAKEFLAGS. This avoids
 # ugly warnings when calling make.