Declare more variables in perl scripts with 'my' instead of 'our'

diff --git a/ChangeLog b/ChangeLog
index 19e130a65a6864c1eea9ddaa8e716fb7f919f4e7..b17920bbecd4891395ab47553b7617ef0bc51771 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-24  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-scanpackages.pl (%vercache): Declare with 'my' instead
+       of 'our'.
+       * scripts/dpkg-shlibdeps.pl ($host_arch): Likewise.
+
 2007-11-24  Guillem Jover  <guillem@debian.org>
 
        * scripts/Dpkg/Arch.pm (get_raw_host_arch): Do not shadow

diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index f8bab35f2dbdf36b3ba05b69bfee72e68551d84a..d38958d3478e42175950164a08b216e93b9210f4 100755 (executable)
--- 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 438eaaceeef4420f6bb195ace99dbe4ea6c6438e..039284f4f21790afc750a96d70267f8a55164a94 100755 (executable)
--- 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") {