[Reproducible-commits] [dpkg] 08/10: dpkg-genchanges: Fix perl warning when parsing BY-HAND file entries

Holger Levsen holger at layer-acht.org
Tue May 3 08:44:19 UTC 2016


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to annotated tag 1.17.25
in repository dpkg.

commit 23e354ae1211a754fdafd6718e3e61398f6c1d37
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Mar 24 23:57:35 2015 +0100

    dpkg-genchanges: Fix perl warning when parsing BY-HAND file entries
    
    Regression introduced in commit e1749d77a44ee1c82c2d047cf9be4b071554832d.
    
    Closes: #781074
---
 debian/changelog           | 2 ++
 scripts/dpkg-genchanges.pl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4ef9a2c..6d965c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ dpkg (1.17.25) UNRELEASED; urgency=low
   * Use correct versions in Conflicts for removed packages. Closes: #776984
   * Use backports friendly versions in Breaks/Conflicts.
     Reported by Thorsten Glaser <tg at debian.org>.
+  * Fix perl warning in dpkg-genchanges when parsing BY-HAND file entries.
+    Regression introduced in dpkg 1.17.7. Closes: #781074
 
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #779953
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 3303d5c..163a30e 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -488,7 +488,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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git



More information about the Reproducible-commits mailing list