summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-06 16:22:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-06 16:22:04 +0000
commit7f00e07ad736eae1d0ec56c43e2da61bfc9f1900 (patch)
tree71fa7a1021e3921b3816517bfacab8b9b8406d98
parentc3013e208935bac1b1f546f36c2beb0e51714817 (diff)
downloadurpmi-7f00e07ad736eae1d0ec56c43e2da61bfc9f1900.tar
urpmi-7f00e07ad736eae1d0ec56c43e2da61bfc9f1900.tar.gz
urpmi-7f00e07ad736eae1d0ec56c43e2da61bfc9f1900.tar.bz2
urpmi-7f00e07ad736eae1d0ec56c43e2da61bfc9f1900.tar.xz
urpmi-7f00e07ad736eae1d0ec56c43e2da61bfc9f1900.zip
simplify
-rwxr-xr-xurpmi6
1 files changed, 3 insertions, 3 deletions
diff --git a/urpmi b/urpmi
index 2d64d111..f90f7c80 100755
--- a/urpmi
+++ b/urpmi
@@ -606,14 +606,14 @@ if (@root_only && !$env) {
"Proceed with the installation of the %d packages?",
$urpm->{nb_install}, $urpm->{nb_install})
. sprintf(" (%s)", formatXiB($urpm->selected_size($state)));
- my $p = join "\n", @to_install;
+ my $p = join("\n", $msg, @to_install, $msg2);
if ($env && !$options{debug__do_not_install}) {
- print "$msg\n$p\n$msg2\n";
+ print "$p\n";
exit 0; #- exit now for specific environment.
}
my $noexpr = N("Nn");
my $yesexpr = N("Yy");
- message_input("$msg\n$p\n$msg2" . N(" (Y/n) "), $force && $yesexpr, boolean => 1) =~ /[$noexpr]/ and exit 0;
+ message_input($p . N(" (Y/n) "), $force && $yesexpr, boolean => 1) =~ /[$noexpr]/ and exit 0;
}
my $exit_code = urpm::main_loop::run($urpm, $state,