From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 10 Aug 2009 19:08:09 +0000 (-0400)
Subject: minor code cleanup and optimisation
X-Git-Tag: 7.3.13~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ac137e294510d76c6cb879e0c1834978532fb137;p=debhelper.git

minor code cleanup and optimisation
---

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="";