From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Nov 2011 15:54:53 +0000 (-0400)
Subject: dh: Ensure -a and -i are passed when running override_dh_command-arch and override_dh... 
X-Git-Tag: 8.9.10~1
X-Git-Url: https://git.donarmstrong.com/?p=debhelper.git;a=commitdiff_plain;h=acdbeed0679cd7b7835a78ffc34814492e94a545

dh: Ensure -a and -i are passed when running override_dh_command-arch and override_dh_command-indep targets. This is needed when the binary target is run, rather than binary-arch/binary-indep. Closes: #648901
---

diff --git a/debian/changelog b/debian/changelog
index 6ebb4d0..d99968f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ debhelper (8.9.10) UNRELEASED; urgency=low
     Needs a new enough binutils and gdb; debhelper backport
     may need to disable this.
     Thanks, Aurelien Jarno and Bastien ROUCARIES. Closes: #631985
+  * dh: Ensure -a and -i are passed when running override_dh_command-arch
+    and override_dh_command-indep targets. This is needed when the binary
+    target is run, rather than binary-arch/binary-indep. Closes: #648901
 
  -- Joey Hess <joeyh@debian.org>  Mon, 07 Nov 2011 13:50:30 -0400
 
diff --git a/dh b/dh
index 4eae444..27733ac 100755
--- a/dh
+++ b/dh
@@ -726,6 +726,13 @@ sub run_override {
 	return @rest if ! $has_explicit_target; # has empty override
 	return @rest unless @todo; # has override, but no packages to act on
 
+	if (defined $override_type) {
+		# Ensure appropriate -a or -i option is passed when running
+		# an arch-specific override target.
+		my $opt=$override_type eq "arch" ? "-a" : "-i";
+		push @options, $opt unless grep { $_ eq $opt } @options;
+	}
+
 	# This passes the options through to commands called
 	# inside the target.
 	$ENV{DH_INTERNAL_OPTIONS}=join("\x1e", @options);