From 6ed69fe7e9936897d5686348d7230f9d3f2f35bd Mon Sep 17 00:00:00 2001 From: Steve McIntyre Date: Sun, 19 Jan 2014 23:55:56 +0000 Subject: [PATCH] tools/apt-selection: pass APT::Architectures:: when calling apt; otherwise if we're running on a multi-arch system apt will break --- debian/changelog | 8 ++++++++ tools/apt-selection | 1 + 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0fdc8e00..4b43309c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debian-cd (3.1.15) UNRELEASED; urgency=medium + + [ Steve McIntyre ] + * tools/apt-selection: pass APT::Architectures:: when calling apt; + otherwise if we're running on a multi-arch system apt will break + + -- Steve McIntyre <93sam@debian.org> Tue, 14 Jan 2014 17:19:22 +0100 + debian-cd (3.1.14) unstable; urgency=medium [ Steve McIntyre ] diff --git a/tools/apt-selection b/tools/apt-selection index ea8ba331..729eb626 100755 --- a/tools/apt-selection +++ b/tools/apt-selection @@ -34,6 +34,7 @@ options=" -q -o Dir::State::status=$APTTMP/$CODENAME-$ARCH/status \ -o APT::Cache::AllVersions=0 \ -o APT::Cache::ShowVersion=1 \ -o APT::Architecture=$ARCH \ + -o APT::Architectures::=$ARCH \ -o Acquire::Languages=none" sections=main