Просмотр исходного кода

Make %fieldimps private to controllib.pl

Guillem Jover лет назад: 19
Родитель
Сommit
25b4639cae
5 измененных файлов с 10 добавлено и 4 удалено
  1. 7 0
      ChangeLog
  2. 2 1
      scripts/controllib.pl
  3. 0 1
      scripts/dpkg-genchanges.pl
  4. 0 1
      scripts/dpkg-gencontrol.pl
  5. 1 1
      scripts/dpkg-source.pl

+ 7 - 0
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

+ 2 - 1
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 = @_;

+ 0 - 1
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;

+ 0 - 1
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;

+ 1 - 1
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;