From 86471e3015c98791cf9865f4fbe1870483573a6e Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 24 Nov 2007 05:48:50 +0200 Subject: [PATCH] Declare more variables in perl scripts with 'my' instead of 'our' --- ChangeLog | 6 ++++++ scripts/dpkg-scanpackages.pl | 2 +- scripts/dpkg-shlibdeps.pl | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19e130a6..b17920bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-24 Guillem Jover + + * scripts/dpkg-scanpackages.pl (%vercache): Declare with 'my' instead + of 'our'. + * scripts/dpkg-shlibdeps.pl ($host_arch): Likewise. + 2007-11-24 Guillem Jover * scripts/Dpkg/Arch.pm (get_raw_host_arch): Do not shadow diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl index f8bab35f..d38958d3 100755 --- a/scripts/dpkg-scanpackages.pl +++ b/scripts/dpkg-scanpackages.pl @@ -140,7 +140,7 @@ defined($override) and (-e $override or $pathprefix = '' if not defined $pathprefix; -our %vercache; +my %vercache; sub vercmp { my ($a,$b)=@_; return $vercache{$a}{$b} if exists $vercache{$a}{$b}; diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl index 438eaace..039284f4 100755 --- a/scripts/dpkg-shlibdeps.pl +++ b/scripts/dpkg-shlibdeps.pl @@ -18,8 +18,6 @@ use Dpkg::Shlibs::SymbolFile; use Dpkg::Arch qw(get_host_arch); use Dpkg::Fields qw(capit); -our $host_arch= get_host_arch(); - # By increasing importance my @depfields= qw(Suggests Recommends Depends Pre-Depends); my $i=0; my %depstrength = map { $_ => $i++ } @depfields; @@ -36,6 +34,7 @@ my $varnameprefix= 'shlibs'; my $ignore_missing_info= 0; my $debug= 0; my @exclude = (); +my $host_arch = get_host_arch(); my (@pkg_shlibs, @pkg_symbols); if (-d "debian") { -- 2.39.5