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

revert r7373: does not actually do what it says on the tin - need to restructure the dump_config routine to enforce an explicit nested order.

Browse source 
git-svn-id: http://emdebian.org/svn/current@7382 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2010-08-25 19:53:33 +00:00
parent 3e95c32799
commit 8c6ae7d6bd
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
multistrap
View file

@ -923,7 +923,7 @@ sub dump_config {
printf ("include:\t"._g("No included configuration files.\n")); printf ("include:\t"._g("No included configuration files.\n"));
} }
my @srcdump=(); my @srcdump=();
foreach my $src (keys %sources) { foreach my $src (sort keys %sources) {
next if ((!grep(/^$src$/i, @aptsources)) or (!grep(/^$src$/i, @debootstrap))); next if ((!grep(/^$src$/i, @aptsources)) or (!grep(/^$src$/i, @debootstrap)));
push @srcdump, $sources{$src}; push @srcdump, $sources{$src};
} }
@ -938,14 +938,14 @@ sub dump_config {
} }
} }
print "packages:\tPackages: ".join (", ", sort @long)."\n"; print "packages:\tPackages: ".join (", ", sort @long)."\n";
print "suites: \tSuites: ".join (", ", values %suites)."\n"; print "suites: \tSuites: ".join (", ", sort values %suites)."\n";
print "components\tComponents: ".join (", ", values %components)."\n"; print "components\tComponents: ".join (", ", sort values %components)."\n";
my $msg="omitdebsrc\t"._g("Omit deb-src from sources.list for sections:"); my $msg="omitdebsrc\t"._g("Omit deb-src from sources.list for sections:");
foreach my $omit (sort keys %omitdebsrc) { foreach my $omit (sort keys %omitdebsrc) {
$msg .= $omitdebsrc{$omit} if (defined $omitdebsrc{$omit}); $msg .= $omitdebsrc{$omit} if (defined $omitdebsrc{$omit});
} }
print "$msg\n"; print "$msg\n";
$msg=""; $msg="";
if (defined $explicit_suite) { if (defined $explicit_suite) {
printf("explicitsuite:\t"._g("Explicit suite selection: Yes\n")); printf("explicitsuite:\t"._g("Explicit suite selection: Yes\n"));
} else { } else {