Complete the support for 'flat' repositories (Closes: #619959)

git-svn-id: http://emdebian.org/svn/current@7964 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2011-03-31 15:43:17 +00:00
parent 9da8725e4a
commit ab39cd5914
2 changed files with 4 additions and 3 deletions

3
debian/changelog vendored
View file

@ -14,8 +14,9 @@ multistrap (2.1.13) unstable; urgency=low
(Closes: #619069) (Closes: #619069)
* Improve source download method to get packages individually - avoids * Improve source download method to get packages individually - avoids
breakage if the repository is incomplete. breakage if the repository is incomplete.
* Complete the support for 'flat' repositories (Closes: #619959)
-- Neil Williams <codehelp@debian.org> Thu, 31 Mar 2011 16:37:48 +0100 -- Neil Williams <codehelp@debian.org> Thu, 31 Mar 2011 16:42:34 +0100
multistrap (2.1.12) unstable; urgency=low multistrap (2.1.12) unstable; urgency=low

View file

@ -404,8 +404,8 @@ foreach my $aptsrc (@aptsources) {
or die _g("Cannot open sources list"). $!; or die _g("Cannot open sources list"). $!;
$mirror = $sources{$aptsrc}; $mirror = $sources{$aptsrc};
$suite = (exists $flatfile{$aptsrc}) ? "" : $suites{$aptsrc}; $suite = (exists $flatfile{$aptsrc}) ? "" : $suites{$aptsrc};
$component = (defined $components{$aptsrc}) ? $components{$aptsrc} $component = (exists $flatfile{$aptsrc}) ? ""
: (exists $flatfile{$aptsrc}) ? "" : "main"; : (defined $components{$aptsrc}) ? $components{$aptsrc} : "main";
if (defined $mirror and defined $suite) { if (defined $mirror and defined $suite) {
print SOURCES "deb $mirror $suite $component\n"; print SOURCES "deb $mirror $suite $component\n";
print SOURCES "deb-src $mirror $suite $component\n" if (not defined $omitdebsrc{$aptsrc}); print SOURCES "deb-src $mirror $suite $component\n" if (not defined $omitdebsrc{$aptsrc});