Przeglądaj źródła

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.
Guillem Jover 9 lat temu
rodzic
commit
4b7990d7ec
2 zmienionych plików z 5 dodań i 3 usunięć
  1. 2 0
      debian/changelog
  2. 3 3
      scripts/dpkg-genchanges.pl

+ 2 - 0
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
     make it possible to enable or disable specific features that should be
     recorded in the .buildinfo file. For now only “all” and “path” are
     recorded in the .buildinfo file. For now only “all” and “path” are
     supported. Closes: #848705
     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:
   * Portability:
     - On GNU/Hurd try to use the new process executable name attribute from
     - On GNU/Hurd try to use the new process executable name attribute from
       libps, to properly match on start-stop-daemon --exec.
       libps, to properly match on start-stop-daemon --exec.

+ 3 - 3
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.
     # If this is a source-only upload, ignore any other artifacts.
     next if build_has_none(BUILD_BINARY);
     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$/) {
     if (defined $file->{package} && $file->{package_type} =~ m/^u?deb$/) {
         $p2f{$file->{package}} //= [];
         $p2f{$file->{package}} //= [];
         push @{$p2f{$file->{package}}}, $file->{filename};
         push @{$p2f{$file->{package}}}, $file->{filename};
-
-        push @archvalues, $file->{arch}
-            if defined $file->{arch} and not $archadded{$file->{arch}}++;
     }
     }
 }
 }