[dpkg] 134/200: Revert "dpkg-genchanges: Only add architectures for .deb/.udeb artifacts"

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository dpkg.

commit 4b7990d7ec9af59678dbda90ba0b86d967c2a36b
Author: Guillem Jover <guillem at debian.org>
Date:   Fri Jan 27 04:01:19 2017 +0100

    Revert "dpkg-genchanges: Only add architectures for .deb/.udeb artifacts"
    
    This reverts commit cae957871dad79bbd48e264611ad3b4ca146dd7c.
    
    This was done to handle the .buildinfo files, but the changes is bogus,
    as it breaks the historical behavior of taking into account non-deb
    files such as by-hand ones.
---
 debian/changelog           | 2 ++
 scripts/dpkg-genchanges.pl | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90a46f6..abea4d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ dpkg (1.18.19) UNRELEASED; urgency=medium
     make it possible to enable or disable specific features that should be
     recorded in the .buildinfo file. For now only “all” and “path” are
     supported. Closes: #848705
+  * Add again the architecture from the filename to .changes files for any
+    artifact with one. This reverts the change introduced in dpkg 1.18.11.
   * Portability:
     - On GNU/Hurd try to use the new process executable name attribute from
       libps, to properly match on start-stop-daemon --exec.
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 6de26c8..745aaa0 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -312,12 +312,12 @@ foreach my $file ($dist->get_files()) {
     # If this is a source-only upload, ignore any other artifacts.
     next if build_has_none(BUILD_BINARY);
 
+    if (defined $file->{arch}) {
+        push @archvalues, $file->{arch} if not $archadded{$file->{arch}}++;
+    }
     if (defined $file->{package} && $file->{package_type} =~ m/^u?deb$/) {
         $p2f{$file->{package}} //= [];
         push @{$p2f{$file->{package}}}, $file->{filename};
-
-        push @archvalues, $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