josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Override APT::Default-Release (Closes: #637434)

Browse source 
git-svn-id: http://emdebian.org/svn/current@8062 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2011-08-13 09:17:06 +00:00
parent 0c68083a34
commit 9e5afa7223
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -9,8 +9,9 @@ multistrap (2.1.16) unstable; urgency=low
* Package an example of multiarch support. * Package an example of multiarch support.
* Simplify the test for a multiarch-aware dpkg, thanks to Steve * Simplify the test for a multiarch-aware dpkg, thanks to Steve
Langasek. Langasek.
* Override APT::Default-Release (Closes: #637434)
-- Neil Williams <codehelp@debian.org> Wed, 10 Aug 2011 21:35:22 +0100 -- Neil Williams <codehelp@debian.org> Sat, 13 Aug 2011 09:40:16 +0100
multistrap (2.1.15) unstable; urgency=low multistrap (2.1.15) unstable; urgency=low

5
multistrap
View file

@ -324,7 +324,7 @@ $config_str .= " -o Apt::Get::AllowUnauthenticated=true"
$config_str .= " -o Apt::Get::Download-Only=true"; $config_str .= " -o Apt::Get::Download-Only=true";
$config_str .= " -o Apt::Install-Recommends=false"; $config_str .= " -o Apt::Install-Recommends=false";
$config_str .= " -o Dir=$dir"; $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) { if (defined $deflist) {
$sourcesname = "sources.list.d/multistrap.sources.list"; $sourcesname = "sources.list.d/multistrap.sources.list";
$config_str .= " -o Dir::Etc::SourceList=${dir}${etcdir}$sourcesname"; $config_str .= " -o Dir::Etc::SourceList=${dir}${etcdir}$sourcesname";
@ -1141,7 +1141,8 @@ sub cascade {
} }
push @foreignarches, @ma; push @foreignarches, @ma;
my @d=(); my @d=();
@d = split(' ', lc($keys{$section}{'debootstrap'})); @d = split(' ', lc($keys{$section}{'debootstrap'}))
if (defined $keys{$section}{'debootstrap'});
push @debootstrap, @d; push @debootstrap, @d;
my @b = split(' ', lc($keys{$section}{'bootstrap'})) my @b = split(' ', lc($keys{$section}{'bootstrap'}))
if (defined $keys{$section}{'bootstrap'}); if (defined $keys{$section}{'bootstrap'});