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

Allow empty aptsources.

Browse source 
git-svn-id: http://emdebian.org/svn/current@8047 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2011-07-08 19:04:27 +00:00
parent 327303b340
commit 2d49249fd4
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -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 multistrap (2.1.15) unstable; urgency=low
* Clean up the retainsources behaviour (Closes: #627179) * Clean up the retainsources behaviour (Closes: #627179)

11
multistrap
View file

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