X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debian%2FDebhelper%2FDh_Lib.pm;h=a546dbf5e902f34835583d66848584ccedfe1a4a;hb=ac137e294510d76c6cb879e0c1834978532fb137;hp=28a90f7bdad16b37900c7021d9b055f2d8f6388b;hpb=16b20dfd69af55f312f21a98d1344252ae179238;p=debhelper.git

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