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

tidy up output again.

Browse source 
git-svn-id: http://emdebian.org/svn/current@7387 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2010-08-25 21:54:03 +00:00
parent 7528669e79
commit 743fbdccbd
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
multistrap
View file

@ -32,7 +32,8 @@ use vars qw/ $progname $ourversion $dstrap $extra @aptsources $mirror
$type $file $config $tidy $noauth $keyring %keyrings $deflist $cfgdir $type $file $config $tidy $noauth $keyring %keyrings $deflist $cfgdir
@extrapkgs @includes %source $setupsh $configsh $omitrequired $dryrun @extrapkgs @includes %source $setupsh $configsh $omitrequired $dryrun
$omitpreinst @reinstall $tgzname %uniq %required $check @check %uniq $omitpreinst @reinstall $tgzname %uniq %required $check @check %uniq
$explicit_suite $allow_recommends %omitdebsrc @dsclist @sectoutput /; $explicit_suite $allow_recommends %omitdebsrc @dsclist @sectoutput
%flatfile /;
setlocale(LC_MESSAGES, ""); setlocale(LC_MESSAGES, "");
textdomain("multistrap"); textdomain("multistrap");
@ -931,7 +932,7 @@ sub dump_config {
@sorted = sort keys %uniq; @sorted = sort keys %uniq;
%uniq=(); %uniq=();
print "\tsuite: \t$suites{$sect_name}\n"; print "\tsuite: \t$suites{$sect_name}\n";
print "\tcomponent\t$components{$sect_name}\n"; print "\tcomponents:\t$components{$sect_name}\n";
# only packages can have a list # only packages can have a list
next if (not grep(/^$sect_name$/i, @debootstrap)); next if (not grep(/^$sect_name$/i, @debootstrap));
print "\tBootstrap:\tpackages: ".join(" ", @sorted)."\n"; print "\tBootstrap:\tpackages: ".join(" ", @sorted)."\n";
@ -973,9 +974,9 @@ sub dump_config {
$msg .= sprintf(_g("Cannot determine directory from '%s'.\n"), $file); $msg .= sprintf(_g("Cannot determine directory from '%s'.\n"), $file);
} }
printf ("unpack: \t"._g("extract all downloaded archives: %s\n"), $unpack) if (defined $unpack); printf ("unpack: \t"._g("extract all downloaded archives: %s\n"), $unpack) if (defined $unpack);
print "configscript\t: $configsh\n" if (defined $configsh); print "configscript:\t$configsh\n" if (defined $configsh);
print "setupscript\t: $setupsh\n" if (defined $setupsh); print "setupscript:\t$setupsh\n" if (defined $setupsh);
print "omitrequired\t: $omitrequired\n" if (defined $omitrequired); print "omitrequired:\t$omitrequired\n" if (defined $omitrequired);
if (defined $tidy) { if (defined $tidy) {
printf ("cleanup: \t"._g("remove apt cache data: true\n")); printf ("cleanup: \t"._g("remove apt cache data: true\n"));
} else { } else {