Fix override handling in dpkg-scanpackages which was broken in

1.13.14 and .15. Closes: #353305

diff --git a/ChangeLog b/ChangeLog
index 6ef520a906cc80059d1242fd6a53c6c5c61e20a1..7fc1af1c080cc42f8cae28b97006d1b09aa7dfaf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-17  Frank Lichtenheld  <djpig@debian.org>
+
+       * scripts/dpkg-scanpackages.pl: Fix override handling
+       which was broken by the latest changes.
+
 2006-02-17  Guillem Jover  <guillem@debian.org>
 
        * debian/dselect.install: Install only dselect domain.

diff --git a/debian/changelog b/debian/changelog
index 09354244fa6998fcb26c929dfcaeb22cc23eb15d..5ecb8b5dc5442f8a2d423051bee511ad8a133e1c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ dpkg (1.13.16~) UNRELEASED; urgency=low
     be installed if dselect is not to be built.
   * Move dselect gettext strings to its own domain provided now by the
     dselect package.
+  
+  [ Frank Lichtenheld ]
+  * Fix override handling in dpkg-scanpackages which was broken in
+    1.13.14 and .15. Closes: #353305
 
  -- Guillem Jover <guillem@debian.org>  Fri, 17 Feb 2006 03:52:59 +0200
 

diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index b7031f445a6aa3167962107641c0537fa2cde9eb..bbda6c6d4df194a05fc834bbf3bf95dde56b7b1a 100755 (executable)
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -189,10 +189,11 @@ my $override_fh = new IO::File $override,'r'
 while (<$override_fh>) {
     s/\#.*//;
     s/\s+$//;
+    next unless $_;
     my ($p,$priority,$section,$maintainer)= split(/\s+/,$_,4);
     next unless defined($packages{$p});
     for my $package (@{$packages{$p}}) {
-        if (defined $maintainer and length($maintainer)) {
+        if ($maintainer) {
              if ($maintainer =~ m/(.+?)\s*=\>\s*(.+)/) {
                   my $oldmaint= $1;
                   my $newmaint= $2;
@@ -203,15 +204,15 @@ while (<$override_fh>) {
                   } else {
                        $$package{Maintainer}= $newmaint;
                   }
-             }
-        } elsif ($$package{Maintainer} eq $maintainer) {
-             push(@samemaint,"  $p ($maintainer)\n");
-        } else {
-             print(STDERR " * Unconditional maintainer override for $p *\n") || die $!;
-             $$package{Maintainer}= $maintainer;
-        }
-        $packages{$p}{Priority}= $priority;
-        $packages{$p}{Section}= $section;
+              } elsif ($$package{Maintainer} eq $maintainer) {
+                  push(@samemaint,"  $p ($maintainer)\n");
+              } else {
+                  print(STDERR " * Unconditional maintainer override for $p *\n") || die $!;
+                  $$package{Maintainer}= $maintainer;
+              }
+         }
+        $$package{Priority}= $priority;
+        $$package{Section}= $section;
     }
     $overridden{$p} = 1;
 }