summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-12-05 20:45:44 +0000
committerFrancois Pons <fpons@mandriva.com>2003-12-05 20:45:44 +0000
commitfa68bb2c1ab657cfc4b91f5a829d3e945f2a916e (patch)
treee1ff56e0c4c17f25ca453880b102b0459e41e4ba
parentadd3361e94bcf7cea947a7d0847443635f85ff75 (diff)
downloadurpmi-fa68bb2c1ab657cfc4b91f5a829d3e945f2a916e.tar
urpmi-fa68bb2c1ab657cfc4b91f5a829d3e945f2a916e.tar.gz
urpmi-fa68bb2c1ab657cfc4b91f5a829d3e945f2a916e.tar.bz2
urpmi-fa68bb2c1ab657cfc4b91f5a829d3e945f2a916e.tar.xz
urpmi-fa68bb2c1ab657cfc4b91f5a829d3e945f2a916e.zip
fixed priority package cut should not be done in test mode !
-rwxr-xr-xurpmi8
1 files changed, 4 insertions, 4 deletions
diff --git a/urpmi b/urpmi
index 5c4b0628..f94508cb 100755
--- a/urpmi
+++ b/urpmi
@@ -66,7 +66,7 @@ delete @ENV{qw(ENV BASH_ENV IFS CDPATH)};
($<, $uid) = ($>, $<);
$ENV{HOME} ||= "/root";
$ENV{USER} ||= "root";
-
+
sub usage {
print STDERR N("urpmi version %s
Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.
@@ -423,7 +423,7 @@ my $restart_itself = $urpm->resolve_dependencies($state, \%requested,
install_src => $install_src,
keep => $keep,
nodeps => $urpm->{options}{'allow-nodeps'} || $urpm->{options}{'allow-force'},
- priority_upgrade => !$env && $urpm->{options}{'priority-upgrade'},
+ priority_upgrade => !$test && !$env && $urpm->{options}{'priority-upgrade'},
);
my @ask_unselect = $urpm->unselected_packages($state);
@@ -602,10 +602,10 @@ foreach my $set (@{$state->{transaction} || []}) {
},
);
my %transaction_sources_install = %{$urpm->extract_packages_to_install(\%transaction_sources) || {}};
-
+
if ($urpm->{options}{'verify-rpm'} && !$force) {
my @bad_signatures = $urpm->check_sources_signatures(\%transaction_sources_install, \%transaction_sources, translate => 1);
-
+
if (@bad_signatures) {
my $msg = N("The following packages have bad signatures");
my $msg2 = N("Do you want to continue installation ?");