From 9e5afa7223ae0dd24830c7f768354301295495de Mon Sep 17 00:00:00 2001 From: codehelp Date: Sat, 13 Aug 2011 09:17:06 +0000 Subject: [PATCH] Override APT::Default-Release (Closes: #637434) git-svn-id: http://emdebian.org/svn/current@8062 563faec7-e20c-0410-992a-a66f704d0ccd --- debian/changelog | 3 ++- multistrap | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b70e9e8..0238c87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,9 @@ multistrap (2.1.16) unstable; urgency=low * Package an example of multiarch support. * Simplify the test for a multiarch-aware dpkg, thanks to Steve Langasek. + * Override APT::Default-Release (Closes: #637434) - -- Neil Williams Wed, 10 Aug 2011 21:35:22 +0100 + -- Neil Williams Sat, 13 Aug 2011 09:40:16 +0100 multistrap (2.1.15) unstable; urgency=low diff --git a/multistrap b/multistrap index 51dc839..b869c30 100755 --- a/multistrap +++ b/multistrap @@ -324,7 +324,7 @@ $config_str .= " -o Apt::Get::AllowUnauthenticated=true" $config_str .= " -o Apt::Get::Download-Only=true"; $config_str .= " -o Apt::Install-Recommends=false"; $config_str .= " -o Dir=$dir"; -$config_str .= " -o Dir::Etc=${dir}${etcdir}"; +$config_str .= " -o Dir::Etc=${dir}${etcdir} -o APT::Default-Release=*"; if (defined $deflist) { $sourcesname = "sources.list.d/multistrap.sources.list"; $config_str .= " -o Dir::Etc::SourceList=${dir}${etcdir}$sourcesname"; @@ -1141,7 +1141,8 @@ sub cascade { } push @foreignarches, @ma; my @d=(); - @d = split(' ', lc($keys{$section}{'debootstrap'})); + @d = split(' ', lc($keys{$section}{'debootstrap'})) + if (defined $keys{$section}{'debootstrap'}); push @debootstrap, @d; my @b = split(' ', lc($keys{$section}{'bootstrap'})) if (defined $keys{$section}{'bootstrap'});