[debhelper-devel] [debhelper] 02/03: Revert 80c955221e83327efb984845f59648678c729978

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit a78b9d23d341ba0e20e3268eb8445c69912959fa
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Jun 4 13:12:21 2017 +0000

    Revert 80c955221e83327efb984845f59648678c729978
    
    It made dh skip "-arch" and "-indep" targets.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog |  4 ++++
 dh               | 18 ++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d2da6a..aa11c07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ debhelper (10.5) UNRELEASED; urgency=medium
     of 0644).  Regression introduced in 10.2.2.
   * dh_installman: Batch chmod calls to reduce the overhead for
     packages with many manpages.
+  * dh: Undo an unsafe optimisation that caused "-indep" and "-arch"
+    override targets to be ignored.  Thanks to Gianfranco Costamagna
+    for reporting it and Iain Lane for tracing it to the commit
+    that introduced the issue.  (Closes: #863887)
 
   [ Iain Lane ]
   * Dh_Lib: Re-add warning + exit 0 for the -i/-a shortcut that was
diff --git a/dh b/dh
index e6404fc..ee8c6cf 100755
--- a/dh
+++ b/dh
@@ -823,16 +823,14 @@ sub run_override {
 	my $has_explicit_target = rules_explicit_target($override);
 
 	if (defined $override_type) {
-		if ($has_explicit_target) {
-			foreach my $package (@{$packages}) {
-				my $isall=package_is_arch_all($package);
-				if (($override_type eq 'indep' && $isall) ||
-					($override_type eq 'arch' && !$isall)) {
-					push @todo, $package;
-				} else {
-					push @rest, $package;
-					push @options, "-N$package";
-				}
+		foreach my $package (@{$packages}) {
+			my $isall=package_is_arch_all($package);
+			if (($override_type eq 'indep' && $isall) ||
+				($override_type eq 'arch' && !$isall)) {
+				push @todo, $package;
+			} else {
+				push @rest, $package;
+				push @options, "-N$package";
 			}
 		}
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git