[devscripts] 02/02: scripts/chdist.pl: also set Apt::Architectures

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit 7c82caa7890ae3b36a8c2738641507107b6eaa6e
Author: josch <j.schauer at email.de>
Date:   Tue Jan 6 13:16:52 2015 +0100

    scripts/chdist.pl: also set Apt::Architectures
    
     - to prevent foreign arches to leak into the apt tree
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog  | 4 ++++
 scripts/chdist.pl | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a14d368..c072b06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ devscripts (2.15.1+exp1) UNRELEASED; urgency=medium
   * debsnap: When specified version or architectures aren't available, warn
     and exit with error code 2.  (Closes: #774276)
 
+  [ Johannes Schauer ]
+  * chdist: Also set Apt::Architectures to prevent foreign architectures from
+    the host leaking into the apt tree (Closes: #774685)
+
  -- James McCoy <jamessan at debian.org>  Sat, 03 Jan 2015 00:47:36 -0500
 
 devscripts (2.15.1) unstable; urgency=medium
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index 3f8001f..7584232 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -237,6 +237,7 @@ sub aptopts
     if ($arch) {
 	print "W: Forcing arch $arch for this command only.\n";
 	push(@opts, '-o', "Apt::Architecture=$arch");
+	push(@opts, '-o', "Apt::Architectures=$arch");
     }
     return @opts;
 }
@@ -370,6 +371,7 @@ EOF
     print FH <<EOF;
 Apt {
    Architecture "$arch";
+   Architectures "$arch";
 };
 
 Dir "$dir";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git