Преглед изворни кода

dpkg-scanpackages: Do not remap obsolete fields

Those fields have been remappedd already by “dpkg-deb -I”.
Guillem Jover пре 17 година
родитељ
комит
e6c2713bd4
2 измењених фајлова са 2 додато и 7 уклоњено
  1. 2 0
      debian/changelog
  2. 0 7
      scripts/dpkg-scanpackages.pl

+ 2 - 0
debian/changelog

@@ -8,6 +8,8 @@ dpkg (1.15.4) UNRELEASED; urgency=low
     as they have been handled already by “dpkg-deb -I”.
   * Switch dpkg-scansources to use Dpkg::Cdata instead of duplicating the
     .dsc parsing code. As a side effect it now handles properly bogus files.
+  * Do not remap obsolete fields in dpkg-scanpackages as they have been
+    handled already by “dpkg-deb -I”.
 
   [ Updated dpkg translations ]
   * French (Christian Perrier).

+ 0 - 7
scripts/dpkg-scanpackages.pl

@@ -22,12 +22,6 @@ my @spuriousover;
 my %packages;
 my %overridden;
 
-my %kmap= (optional         => 'suggests',
-	   recommended      => 'recommends',
-	   class            => 'priority',
-	   package_revision => 'revision',
-	  );
-
 my @sums;
 foreach (@check_supported) {
     my $copy = uc($_);
@@ -188,7 +182,6 @@ FILE:
 	my $temp = $control;
 	while ($temp =~ s/^\n*(\S+):[ \t]*(.*(\n[ \t].*)*)\n//) {
 	    my ($key,$value)= (lc $1,$2);
-	    if (defined($kmap{$key})) { $key= $kmap{$key}; }
 	    if (defined($field_case{$key})) { $key= $field_case{$key}; }
 	    $value =~ s/\s+$//;
 	    $tv{$key}= $value;