summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-08-10 15:08:09 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-08-10 15:08:09 -0400
commitac137e294510d76c6cb879e0c1834978532fb137 (patch)
treee780e9b2b79066f281af4e2882c9b8ae48b9af67
parent16b20dfd69af55f312f21a98d1344252ae179238 (diff)
minor code cleanup and optimisation
-rw-r--r--Debian/Debhelper/Dh_Lib.pm9
1 files changed, 2 insertions, 7 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 28a90f7..a546dbf 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -681,12 +681,6 @@ sub getpackages {
%package_arches=();
$type="" if ! defined $type;
-
- # Look up the build arch if we need to.
- my $buildarch='';
- if ($type eq 'same') {
- $buildarch=buildarch();
- }
my $package="";
my $arch="";
@@ -724,7 +718,8 @@ sub getpackages {
if ($package &&
(($type eq 'indep' && $arch eq 'all') ||
($type eq 'arch' && $arch ne 'all') ||
- ($type eq 'same' && ($arch eq 'any' || samearch($buildarch, $arch))) ||
+ ($type eq 'same' && ($arch eq 'any' ||
+ samearch(buildarch(), $arch))) ||
! $type)) {
push @list, $package;
$package="";