Allow empty aptsources.

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

debian/changelog

@@ -1,3 +1,9 @@
+multistrap (2.1.16) unstable; urgency=low
+
+  * Allow empty aptsources.
+
+ -- Neil Williams <codehelp@debian.org>  Fri, 08 Jul 2011 20:03:27 +0100
+
 multistrap (2.1.15) unstable; urgency=low
 
   * Clean up the retainsources behaviour (Closes: #627179)

multistrap

@@ -136,14 +136,14 @@ if ((not defined $arch) or ($arch eq "")) {
 	printf (_g("Using foreign architecture: %s\n"), $arch);
 }
 $foreign++ if ($host ne $arch);
-
-unless (keys %sources and @aptsources) {
+unless (keys %sources) {
 	my $msg = sprintf(_g("No sources defined for a foreign multistrap.
 	Using your existing apt sources. To use different sources,
 	list them with aptsources= in '%s'."), $file);
 	warn ("$progname: $msg\n");
 	$warn_count++;
-	$deflist = prepare_sources_list();
+	my $l = prepare_sources_list();
+	$deflist = join ("", @$l);
 }
 
 # Translators: fields are: programname, architecture, host architecture.
@@ -1113,7 +1113,10 @@ sub cascade {
 			my @b = split(' ', lc($keys{$section}{'bootstrap'}))
 				if (defined $keys{$section}{'bootstrap'});
 			push @debootstrap, @b;
-			my @a = split (' ', lc($keys{$section}{'aptsources'}));
+			my @a=();
+			if (exists $keys{$section}{'aptsources'}) {
+				@a = split (' ', lc($keys{$section}{'aptsources'}));
+			}
 			push @aptsources, @a;
 			my @i = split (' ', $keys{$section}{'include'})
 				if (defined $keys{$section}{'include'});