dh: When there's an -indep override target without -arch, or vice versa, avoid acting on packages covered by the override target when running the command for packages not covered by it. Closes: #676462

Hmm, this is technically a behavior change, but hopefully not one anything
could sanely depend on working like it used to.

1 files changed, 10 insertions, 0 deletions

diff --git a/dh b/dh
index 3e6ccf42..17919dce 100755
--- a/dh
+++ b/dh
@@ -662,11 +662,21 @@ foreach my $i (0..$stoppoint) {
 	# the usual command. (The non-arch-specific override is tried first,
 	# for simplest semantics; mixing it with arch-specific overrides
 	# makes little sense.)
+	my @oldtodo=@todo;
 	foreach my $override_type (undef, "arch", "indep") {
 		@todo = run_override($override_type, $command, \@todo, @opts);
 	}
 	next unless @todo;
 
+	# No need to run the command for any packages handled by the
+	# override targets.
+	my %todo=map { $_ => 1 } @todo;
+	foreach my $package (@oldtodo) {
+		if (! $todo{$package}) {
+			push @opts, "-N$package";
+		}
+	}
+
 	run($command, @opts);
 }