]> git.donarmstrong.com Git - debhelper.git/commitdiff
refactor
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 1 Sep 2009 17:10:28 +0000 (13:10 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 1 Sep 2009 17:11:26 +0000 (13:11 -0400)
Debian/Debhelper/Dh_Lib.pm

index a546dbf5e902f34835583d66848584ccedfe1a4a..cd87ebe58f5ba1bbf8b58b06695c152ebe3d8c3e 100644 (file)
@@ -630,10 +630,9 @@ sub dpkg_architecture_value {
        my $os;
 
        sub buildos {
-               return $os if defined $os;
-
-               $os=`dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null` || error("dpkg-architecture failed");
-               chomp $os;
+               if (!defined $os) {
+                       $os=dpkg_architecture_value("DEB_HOST_ARCH_OS");
+               }
                return $os;
        }
 }