summaryrefslogtreecommitdiff
path: root/Debian/Debhelper/Dh_Lib.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-09-01 13:20:37 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-09-01 13:20:37 -0400
commita432550b565cd01d4a67b8cb929f90fa29d299f7 (patch)
tree3a27c356fe53a63adf506b20f8ad6cceac41e2a7 /Debian/Debhelper/Dh_Lib.pm
parent8fc9ed5241e752d51da71982116730e9c7287cb9 (diff)
Optimise -s handling to avoid running dpkg-architecture if the package is arch all.
Diffstat (limited to 'Debian/Debhelper/Dh_Lib.pm')
-rw-r--r--Debian/Debhelper/Dh_Lib.pm4
1 files changed, 3 insertions, 1 deletions
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="";