From: Guillem Jover <guillem@debian.org>
Date: Thu, 6 Sep 2007 01:47:02 +0000 (+0300)
Subject: Make %fieldimps private to controllib.pl
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25b4639cae981a221b70bb601ecbc6dde4529cfb;p=dpkg

Make %fieldimps private to controllib.pl
---

diff --git a/ChangeLog b/ChangeLog
index c6fd9b8a..3f5a792d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-06  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-genchanges.pl (%fieldimps): Remove unused variable.
+	* scripts/dpkg-gencontrol.pl (%fieldimps): Likewise.
+	* scripts/dpkg-source.pl (%fieldimps): Likewise.
+	* scripts/controllib.pl (%fieldimps): Switch from 'our' to 'my'.
+
 2007-09-06  Guillem Jover  <guillem@debian.org>
 
 	* scripts/822-date.pl: Add $dpkglib into @INC, needed by the
diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index a94ff2bf..1b7c52d9 100755
--- a/scripts/controllib.pl
+++ b/scripts/controllib.pl
@@ -15,7 +15,6 @@ our %f;             # - fields ???
 our %fi;            # - map of fields values. keys are of the form "S# key"
                     #   where S is source (L is changelog, C is control)
                     #   and # is an index
-our %fieldimps;
 our %p2i;           # - map from datafile+packagename to index in controlfile
                     #   (used if multiple packages can be listed). Key is
                     #   "S key" where S is the source and key is the packagename
@@ -340,6 +339,8 @@ sub substvars {
     return $v;
 }
 
+my %fieldimps;
+
 sub set_field_importance(@)
 {
     my @fields = @_;
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 93e36aa3..1709c66a 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -13,7 +13,6 @@ require 'controllib.pl';
 
 our (%f, %fi);
 our %p2i;
-our %fieldimps;
 our %substvar;
 our $sourcepackage;
 our $host_arch;
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index c7563387..12ea429c 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -13,7 +13,6 @@ require 'controllib.pl';
 
 our %substvar;
 our (%f, %fi);
-our %fieldimps;
 our %p2i;
 our @pkg_dep_fields;
 our $sourcepackage;
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 70b4682c..5c16bc4a 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -66,7 +66,7 @@ use Cwd;
 push (@INC, $dpkglibdir);
 require 'controllib.pl';
 
-our (%f, %fi, %fieldimps);
+our (%f, %fi);
 our $sourcepackage;
 our $warnable_error;
 our $quiet_warnings;