The following commit has been merged in the master branch:
commit a64bfa733075a7140193f5a4b9d4292234dd230e
Author: Guillem Jover <[email protected]>
Date: Tue Jan 1 19:30:36 2013 +0100
Dpkg::Arch: Fix value caching by not shadowing the variables
Addresses Variables::ProhibitReusedNames.
diff --git a/debian/changelog b/debian/changelog
index 710fc97..061f23c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -130,6 +130,7 @@ dpkg (1.17.0) UNRELEASED; urgency=low
* Change dpkg and dpkg-deb help output to recommend apt instead of dselect
as a user-friendly frontend.
* Remove temporary file on error during «dpkg-divert --rename».
+ * Fix value caching in Dpkg::Arch by not shadowing the variables.
[ Updated programs translations ]
* Fix typo in Spanish translation of update-alternatives.
diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index 39725aa..a905cf6 100644
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
@@ -60,7 +60,7 @@ my %debarch_to_debtriplet;
# dpkg-architecture itself, by avoiding computing the DEB_BUILD_
# variables when they are not requested.
- my $build_arch = `dpkg --print-architecture`;
+ $build_arch = `dpkg --print-architecture`;
syserr('dpkg --print-architecture failed') if $? >> 8;
chomp $build_arch;
@@ -76,7 +76,7 @@ my %debarch_to_debtriplet;
{
return $gcc_host_gnu_type if defined $gcc_host_gnu_type;
- my $gcc_host_gnu_type = `\${CC:-gcc} -dumpmachine`;
+ $gcc_host_gnu_type = `\${CC:-gcc} -dumpmachine`;
if ($? >> 8) {
$gcc_host_gnu_type = '';
} else {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
