[Reproducible-commits] [dpkg] 37/54: dpkg-architecture: Fix usage of -s after other action options

[Mattia Rizzolo]

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

mattia pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 0b15d3dfb913c2bd6ea687c4061618c58b5e2c0a
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Dec 20 21:24:12 2015 +0100

    dpkg-architecture: Fix usage of -s after other action options
    
    We should always initialize the required variables, otherwise previous
    action options might reset $req_vars and we get unexpected results.
    
    Reported-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog             | 2 ++
 scripts/dpkg-architecture.pl | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c8fd1f6..feb80f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ dpkg (1.18.4) UNRELEASED; urgency=medium
     requires xz >= 5.2.0.
   * Fix physical file offset comparison in dpkg. Closes: #808912
     Thanks to Yuri Gribov <tetra2005 at gmail.com>.
+  * Fix usage of dpkg-architecture -s after other action options.
+    Reported by Niels Thykier <niels at thykier.net>.
   * Test suite:
     - Improve perl code test coverage.
   * Build system:
diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index 64188ea..40c487e 100755
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@ -203,6 +203,7 @@ while (@ARGV) {
     } elsif ($arg eq '-l' or $arg eq '--list') {
 	$action = 'list';
     } elsif ($arg eq '-s' or $arg eq '--print-set') {
+	$req_vars = DEB_ALL;
 	$action = 'print-set';
     } elsif ($arg eq '-f' or $arg eq '--force') {
         $force=1;

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