fix incorrect lexical variables in Debbugs

diff --git a/Debbugs/CGI.pm b/Debbugs/CGI.pm
index 8e4cdd0f1437a037878392e4c0d0b6262d7b6b21..1e87bb7748d0a214125303b9ce8958a9a75f75ad 100644 (file)
--- a/Debbugs/CGI.pm
+++ b/Debbugs/CGI.pm
@@ -37,7 +37,7 @@ use Mail::Address;
 use POSIX qw(ceil);
 use Storable qw(dclone);
 
-my %URL_PARAMS = ();
+our %URL_PARAMS = ();
 
 
 BEGIN{
@@ -213,10 +213,6 @@ sub quitcgi {
 }
 
 
-my %common_bugusertags;
-
-
-
 =head HTML
 
 =head2 htmlize_bugs
@@ -459,10 +455,10 @@ sub htmlize_maintlinks {
 }
 
 
-my $_maintainer;
-my $_maintainer_rev;
+our $_maintainer;
+our $_maintainer_rev;
 
-my $_pseudodesc;
+our $_pseudodesc;
 sub getpseudodesc {
     return $_pseudodesc if $_pseudodesc;
     my %pseudodesc;

diff --git a/Debbugs/Common.pm b/Debbugs/Common.pm
index 7a06f88ff2fc879c6f09f8ec815be00efbca9244..453720fc6c3672d3017ef4d5c7094d9b35a61ba4 100644 (file)
--- a/Debbugs/Common.pm
+++ b/Debbugs/Common.pm
@@ -190,7 +190,7 @@ first address parsed.
 =cut
 
 
-my %_parsedaddrs;
+our %_parsedaddrs;
 sub getparsedaddrs {
     my $addr = shift;
     return () unless defined $addr;
@@ -200,8 +200,8 @@ sub getparsedaddrs {
     return wantarray?@{$_parsedaddrs{$addr}}:$_parsedaddrs{$addr}[0];
 }
 
-my $_maintainer;
-my $_maintainer_rev;
+our $_maintainer;
+our $_maintainer_rev;
 sub getmaintainers {
     return $_maintainer if $_maintainer;
     my %maintainer;
@@ -244,7 +244,7 @@ FLOCKs the passed file. Use unfilelock to unlock it.
 
 =cut
 
-my @filelocks;
+our @filelocks;
 our @cleanups;
 
 sub filelock {

diff --git a/Debbugs/Packages.pm b/Debbugs/Packages.pm
index 664f8225f313e927051ee95add2c4993619bad01..a5c2cacba2e5696dbff1798b1e6fb43f1375f4e0 100644 (file)
--- a/Debbugs/Packages.pm
+++ b/Debbugs/Packages.pm
@@ -52,9 +52,9 @@ source package names.
 
 =cut
 
-my $_pkgsrc;
-my $_pkgcomponent;
-my $_srcpkg;
+our $_pkgsrc;
+our $_pkgcomponent;
+our $_srcpkg;
 sub getpkgsrc {
     return $_pkgsrc if $_pkgsrc;
     return {} unless defined $Debbugs::Packages::gPackageSource;
@@ -116,7 +116,7 @@ with any duplicates removed.
 
 =cut
 
-my %_binarytosource;
+our %_binarytosource;
 sub binarytosource {
     my ($binname, $binver, $binarch) = @_;
 
@@ -173,7 +173,7 @@ returned, without the architecture.
 
 =cut
 
-my %_sourcetobinary;
+our %_sourcetobinary;
 sub sourcetobinary {
     my ($srcname, $srcver) = @_;
 
@@ -204,7 +204,7 @@ architecture
 
 =cut
 
-my %_versions;
+our %_versions;
 sub getversions {
     my ($pkg, $dist, $arch) = @_;
     return () unless defined $gVersionIndex;
@@ -251,7 +251,7 @@ version numbers differ from binary version numbers.
 
 =cut
 
-my %_sourceversioncache = ();
+our %_sourceversioncache = ();
 sub makesourceversions {
     my $pkg = shift;
     my $arch = shift;

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index 22d818345e5ad35432537739fba6e4fff32d91e8..0cc0af9a59a4ad743af6b8951f4a66074a1689d4 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -546,7 +546,7 @@ Returns undef on failure.
 =cut
 
 # This will eventually need to be fixed before we start using mod_perl
-my $version_cache = {};
+our $version_cache = {};
 sub bug_archiveable{
      my %param = validate_with(params => \@_,
                               spec   => {bug => {type => SCALAR,