From 743fbdccbddb5153542d9dd56a149c25742ee270 Mon Sep 17 00:00:00 2001 From: codehelp Date: Wed, 25 Aug 2010 21:54:03 +0000 Subject: [PATCH] tidy up output again. git-svn-id: http://emdebian.org/svn/current@7387 563faec7-e20c-0410-992a-a66f704d0ccd --- multistrap | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/multistrap b/multistrap index 09774ee..fbfbbc2 100755 --- a/multistrap +++ b/multistrap @@ -32,7 +32,8 @@ use vars qw/ $progname $ourversion $dstrap $extra @aptsources $mirror $type $file $config $tidy $noauth $keyring %keyrings $deflist $cfgdir @extrapkgs @includes %source $setupsh $configsh $omitrequired $dryrun $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, ""); textdomain("multistrap"); @@ -931,7 +932,7 @@ sub dump_config { @sorted = sort keys %uniq; %uniq=(); 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 next if (not grep(/^$sect_name$/i, @debootstrap)); print "\tBootstrap:\tpackages: ".join(" ", @sorted)."\n"; @@ -973,9 +974,9 @@ sub dump_config { $msg .= sprintf(_g("Cannot determine directory from '%s'.\n"), $file); } printf ("unpack: \t"._g("extract all downloaded archives: %s\n"), $unpack) if (defined $unpack); - print "configscript\t: $configsh\n" if (defined $configsh); - print "setupscript\t: $setupsh\n" if (defined $setupsh); - print "omitrequired\t: $omitrequired\n" if (defined $omitrequired); + print "configscript:\t$configsh\n" if (defined $configsh); + print "setupscript:\t$setupsh\n" if (defined $setupsh); + print "omitrequired:\t$omitrequired\n" if (defined $omitrequired); if (defined $tidy) { printf ("cleanup: \t"._g("remove apt cache data: true\n")); } else {