summaryrefslogtreecommitdiff
path: root/Debian
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-09-01 13:10:28 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-09-01 13:11:26 -0400
commit8fc9ed5241e752d51da71982116730e9c7287cb9 (patch)
tree781f0809a8d365d9a55cf5da0d6e69185ebed04c /Debian
parent4207083bbd25bc0cbaa1dff02e5c7cbc0ef3b32b (diff)
refactor
Diffstat (limited to 'Debian')
-rw-r--r--Debian/Debhelper/Dh_Lib.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index a546dbf5..cd87ebe5 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -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;
}
}