From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 1 Sep 2009 17:20:37 +0000 (-0400)
Subject: Optimise -s handling to avoid running dpkg-architecture if the package is arch all.
X-Git-Tag: 7.4.0~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a432550b565cd01d4a67b8cb929f90fa29d299f7;p=debhelper.git

Optimise -s handling to avoid running dpkg-architecture if the package is arch all.
---

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index cd87ebe..4ccd12a 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -714,11 +714,13 @@ sub getpackages {
 				$package_types{$package}=$package_type;
 				$package_arches{$package}=$arch;
 			}
+
 			if ($package &&
 			    (($type eq 'indep' && $arch eq 'all') ||
 			     ($type eq 'arch' && $arch ne 'all') ||
 			     ($type eq 'same' && ($arch eq 'any' ||
-			                     samearch(buildarch(), $arch))) ||
+					     ($arch ne 'all' &&
+			                      samearch(buildarch(), $arch)))) ||
 			     ! $type)) {
 				push @list, $package;
 				$package="";
diff --git a/debian/changelog b/debian/changelog
index 5b495fa..c0fdd8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (7.3.17) UNRELEASED; urgency=low
+
+  * Optimise -s handling to avoid running dpkg-architecture if the package
+    is arch all.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 01 Sep 2009 13:19:55 -0400
+
 debhelper (7.3.16) unstable; urgency=low
 
   * dh_desktop: Clarify in man page why it's a no-op.