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

git-svn-id: http://emdebian.org/svn/current@7964 563faec7-e20c-0410-992a-a66f704d0ccd

debian/changelog

@@ -14,8 +14,9 @@ multistrap (2.1.13) unstable; urgency=low
     (Closes: #619069)
   * Improve source download method to get packages individually - avoids
     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

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