[dpkg] 154/187: dpkg-genchanges: Only add architectures for .deb/.udeb artifacts

[Reiner Herrmann]

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

deki-guest pushed a commit to branch master
in repository dpkg.

commit cae957871dad79bbd48e264611ad3b4ca146dd7c
Author: Guillem Jover <guillem at debian.org>
Date:   Wed Nov 2 05:03:19 2016 +0100

    dpkg-genchanges: Only add architectures for .deb/.udeb artifacts
    
    When we are parsing filenames for artifacts that ressemble a known
    package, we should not be assuming that the third basename _-separated
    item is an architecture. Only consider it so for .deb and .udebs.
---
 debian/changelog           | 2 ++
 scripts/dpkg-genchanges.pl | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 513468c..1143bd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,8 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
   * Do substvar instantiation just once in dpkg-gencontrol.
   * Fix dpkg-gencontrol to not update the files list file (debian/files)
     when printing to STDOUT (via -O).
+  * Do not add architectures to .changes Architecture field for artifacts
+    that are not a .deb or .udeb in dpkg-genchanges.
   * Architecture support:
     - Add support for AIX operating system.
     - Add a version pseudo-field to the arch tables.
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 640e9fd..2c3316d 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -313,11 +313,9 @@ if (build_has_any(BUILD_BINARY)) {
         if (defined $file->{package} && $file->{package_type} =~ m/^u?deb$/) {
             $p2f{$file->{package}} //= [];
             push @{$p2f{$file->{package}}}, $file->{filename};
-        }
 
-        if (defined $file->{arch}) {
             push @archvalues, $file->{arch}
-                if $file->{arch} and not $archadded{$file->{arch}}++;
+                if defined $file->{arch} and not $archadded{$file->{arch}}++;
         }
     }
 }

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