summaryrefslogtreecommitdiff
path: root/dh
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-11-16 11:54:53 -0400
committerJoey Hess <joey@kitenet.net>2011-11-16 11:54:53 -0400
commitacdbeed0679cd7b7835a78ffc34814492e94a545 (patch)
tree15a809c490f7feeccba29b6f201bd5593b9debe3 /dh
parenteb955ef0dafe25ac1cb8091c8f2a065d68e18916 (diff)
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
Diffstat (limited to 'dh')
-rwxr-xr-xdh7
1 files changed, 7 insertions, 0 deletions
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);