Commit the actual changes for:

Fix perl warnings in dpkg-genchanges when called with -S. Closes: #423193

diff --git a/ChangeLog b/ChangeLog
index 1f872bf614f78f996429b318781360e34ba509fc..70a8fcf623c2ee5269e4f3cb6e1d15d098720110 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-10  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-genchanges.pl: Only use the %p2f values if defined.
+
 2007-05-09  Guillem Jover  <guillem@debian.org>
 
        * configure.ac: Bump version to 1.14.3~.

diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index dad966bc290fef1045f02e0673831154cd70c240..1f254d309b7ec9ed18e14c705c2a7ef6002f0992 100755 (executable)
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -233,15 +233,15 @@ for $_ (keys %fi) {
 
            if (m/^Description$/) {
                $v=$` if $v =~ m/\n/;
-               if ($f =~ m/\.udeb$/) {
+               if (defined($f) && $f =~ m/\.udeb$/) {
                        push(@descriptions,sprintf("%-10s - %-.65s (udeb)",$p,$v));
                } else {
                        push(@descriptions,sprintf("%-10s - %-.65s",$p,$v));
                }
            } elsif (m/^Section$/) {
-               $f2seccf{$f}= $v;
+               $f2seccf{$f} = $v if defined($f);
            } elsif (m/^Priority$/) {
-               $f2pricf{$f}= $v;
+               $f2pricf{$f} = $v if defined($f);
            } elsif (s/^X[BS]*C[BS]*-//i) {
                $f{$_}= $v;
            } elsif (m/^Architecture$/) {