Kaynağa Gözat

dpkg-genchanges: Fix perl warning when parsing BY-HAND file entries

Cherry picked from commit 23e354ae1211a754fdafd6718e3e61398f6c1d37.

Regression introduced in commit e1749d77a44ee1c82c2d047cf9be4b071554832d.

Closes: #781074
Guillem Jover 11 yıl önce
ebeveyn
işleme
b36dc1c825
2 değiştirilmiş dosya ile 3 ekleme ve 1 silme
  1. 2 0
      debian/changelog
  2. 1 1
      scripts/dpkg-genchanges.pl

+ 2 - 0
debian/changelog

@@ -61,6 +61,8 @@ dpkg (1.18.0) UNRELEASED; urgency=low
   * Switch start-stop-daemon to use a monotonic clock if available. This
     makes the timeout checks resilient to abrupt system clock changes.
     Suggested by Jose M Calhariz <jose.calhariz@hds.com>. Closes: #783014
+  * Fix perl warning in dpkg-genchanges when parsing BY-HAND file entries.
+    Regression introduced in dpkg 1.17.7. Closes: #781074
 
   * Perl modules:
     - Rename and deprecate Dpkg::Gettext _g function with new g_.

+ 1 - 1
scripts/dpkg-genchanges.pl

@@ -489,7 +489,7 @@ $fields->{'Files'} = '';
 for my $file ($dist->get_files()) {
     my $f = $file->{filename};
 
-    if (defined $file->{package}) {
+    if (defined $file->{package} && $file->{package_type} =~ m/^u?deb$/) {
         my $arch_all = debarch_eq('all', $p2arch{$file->{package}});
 
         next if (not ($include & BUILD_ARCH_INDEP) and $arch_all);