diff --git a/debian/changelog b/debian/changelog index 08fd23c..ce87504 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ multistrap (2.1.7) unstable; urgency=low * Add all packages to the source dir, including calculated dependencies. + * Improve the omitdebsrc handling for detection of 'true'. - -- Neil Williams Mon, 02 Aug 2010 17:49:09 -0400 + -- Neil Williams Thu, 05 Aug 2010 19:24:16 -0400 multistrap (2.1.6) unstable; urgency=low diff --git a/multistrap b/multistrap index 473c973..c0efd3e 100755 --- a/multistrap +++ b/multistrap @@ -779,7 +779,7 @@ bootstrap=Debian [Debian] packages= -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=lenny @@ -853,7 +853,8 @@ sub cascade { $packages{$section}=$keys{$section}{'packages'} if (not exists $packages{$section}); $suites{$section}=$keys{$section}{'suite'} if (not exists $suites{$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'})); $components{$section}='main' if (not defined $components{$section}); $keyrings{$section}=$keys{$section}{'keyring'} if (not exists $keyrings{$section});