summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-27 13:11:35 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-27 13:11:35 +0000
commit2315f7d8b759266ad038ef9f0c89a4a089d839b8 (patch)
tree341ffad8df6b8f1acc6d3fd006c04e15bf7307d4
parentcfb8d02ce4054aecfe7549eff6414d56e942285c (diff)
downloadurpmi-2315f7d8b759266ad038ef9f0c89a4a089d839b8.tar
urpmi-2315f7d8b759266ad038ef9f0c89a4a089d839b8.tar.gz
urpmi-2315f7d8b759266ad038ef9f0c89a4a089d839b8.tar.bz2
urpmi-2315f7d8b759266ad038ef9f0c89a4a089d839b8.tar.xz
urpmi-2315f7d8b759266ad038ef9f0c89a4a089d839b8.zip
fix using debug__do_not_install
-rwxr-xr-xurpmi4
1 files changed, 2 insertions, 2 deletions
diff --git a/urpmi b/urpmi
index 07142daa..a5a72fa5 100755
--- a/urpmi
+++ b/urpmi
@@ -586,7 +586,7 @@ if (@root_only && !$env) {
exit 1;
}
$urpm->{nb_install} = @to_install;
-if (!$urpm->{options}{auto} && $ask_user && $urpm->{nb_install} || $env) {
+if (!$urpm->{options}{auto} && $ask_user && $urpm->{nb_install} || $env && !$options{debug__do_not_install}) {
my $msg = $urpm->{nb_install} == 1 ? N("To satisfy dependencies, the following package is going to be installed:")
: N("To satisfy dependencies, the following packages are going to be installed:");
if ($test) {
@@ -602,7 +602,7 @@ if (!$urpm->{options}{auto} && $ask_user && $urpm->{nb_install} || $env) {
"Proceed with the installation of the %d packages?",
$urpm->{nb_install}, $urpm->{nb_install});
my $p = join("\n", $msg, @to_install_formatted, $msg2, $msg3);
- if ($env && !$options{debug__do_not_install}) {
+ if ($env) {
print "$p\n";
exit 0; #- exit now for specific environment.
}