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

Improve the omitdebsrc handling for detection of 'true'.

Browse source 
git-svn-id: http://emdebian.org/svn/current@7360 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2010-08-05 23:25:22 +00:00
parent bccc15c533
commit 8db9dbcff4
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

@ -2,8 +2,9 @@ multistrap (2.1.7) unstable; urgency=low
* Add all packages to the source dir, including calculated * Add all packages to the source dir, including calculated
dependencies. dependencies.
* Improve the omitdebsrc handling for detection of 'true'.
-- Neil Williams <codehelp@debian.org> Mon, 02 Aug 2010 17:49:09 -0400 -- Neil Williams <codehelp@debian.org> Thu, 05 Aug 2010 19:24:16 -0400
multistrap (2.1.6) unstable; urgency=low multistrap (2.1.6) unstable; urgency=low

5
multistrap
View file

@ -779,7 +779,7 @@ bootstrap=Debian
[Debian] [Debian]
packages= packages=
source=http://ftp.uk.debian.org/debian source=http://cdn.debian.net/debian
keyring=debian-archive-keyring keyring=debian-archive-keyring
suite=lenny suite=lenny
@ -853,7 +853,8 @@ sub cascade {
$packages{$section}=$keys{$section}{'packages'} if (not exists $packages{$section}); $packages{$section}=$keys{$section}{'packages'} if (not exists $packages{$section});
$suites{$section}=$keys{$section}{'suite'} if (not exists $suites{$section}); $suites{$section}=$keys{$section}{'suite'} if (not exists $suites{$section});
$components{$section}=$keys{$section}{'components'} if (not exists $components{$section}); $components{$section}=$keys{$section}{'components'} if (not exists $components{$section});
$omitdebsrc{$section}=$keys{$section}{'omitdebsrc'} if (not exists $omitdebsrc{$section}); $omitdebsrc{$section}=$section if ((defined $keys{$section}{'omitdebsrc'})
and ($keys{$section}{'omitdebsrc'} eq "true"));
push @reinstall, split (/ /, lc($keys{$section}{'reinstall'})); push @reinstall, split (/ /, lc($keys{$section}{'reinstall'}));
$components{$section}='main' if (not defined $components{$section}); $components{$section}='main' if (not defined $components{$section});
$keyrings{$section}=$keys{$section}{'keyring'} if (not exists $keyrings{$section}); $keyrings{$section}=$keys{$section}{'keyring'} if (not exists $keyrings{$section});