summaryrefslogtreecommitdiffstats
path: root/urpmi
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-06-26 15:26:42 +0000
committerFrancois Pons <fpons@mandriva.com>2003-06-26 15:26:42 +0000
commitf20a672e01e0caf0fd203ac14f83b09f5a4ce701 (patch)
tree588ed80b3d80ed980c9b78e7eb5e631464947de8 /urpmi
parenta4e5ea60f1de8d46935aeb17cba691a6d572fdf6 (diff)
downloadurpmi-f20a672e01e0caf0fd203ac14f83b09f5a4ce701.tar
urpmi-f20a672e01e0caf0fd203ac14f83b09f5a4ce701.tar.gz
urpmi-f20a672e01e0caf0fd203ac14f83b09f5a4ce701.tar.bz2
urpmi-f20a672e01e0caf0fd203ac14f83b09f5a4ce701.tar.xz
urpmi-f20a672e01e0caf0fd203ac14f83b09f5a4ce701.zip
4.4-8mdk
Diffstat (limited to 'urpmi')
-rwxr-xr-xurpmi11
1 files changed, 7 insertions, 4 deletions
diff --git a/urpmi b/urpmi
index 418100d6..f25947e7 100755
--- a/urpmi
+++ b/urpmi
@@ -416,7 +416,7 @@ if (@ask_unselect) {
}
}
-my @ask_remove = $urpm->removed_packages($state);
+my @ask_remove = $urpm->{options}{'allow-force'} ? @{[]} : $urpm->removed_packages($state);
if (@ask_remove) {
my $list = join "\n", $urpm->translate_why_removed($state, sort @ask_remove);
@@ -686,7 +686,8 @@ foreach my $set (@{$state->{transaction} || []}) {
gurpm::progress($amount/$total);
}
};
- my @l = $urpm->install($set->{remove} || [], \%transaction_sources_install, \%transaction_sources,
+ my @l = $urpm->install(!$urpm->{options}{'allow-force'} && $set->{remove} || [],
+ \%transaction_sources_install, \%transaction_sources,
translate_message => 1,
oldpackage => $state->{oldpackage}, post_clean_cache => $urpm->{options}{'post-clean'},
test => $test,
@@ -702,7 +703,8 @@ foreach my $set (@{$state->{transaction} || []}) {
message_input(N("Try installation without checking dependencies? (y/N) "), $force && $yesexpr) =~ /[$yesexpr]/
or ++$nok, next;
$urpm->{log}("starting installing packages without deps");
- @l = $urpm->install($set->{remove} || [], \%transaction_sources_install, \%transaction_sources,
+ @l = $urpm->install(!$urpm->{options}{'allow-force'} && $set->{remove} || [],
+ \%transaction_sources_install, \%transaction_sources,
translate_message => 1, nodeps => 1,
oldpackage => $state->{oldpackage}, post_clean_cache => $urpm->{options}{'post-clean'},
test => $test,
@@ -713,7 +715,8 @@ foreach my $set (@{$state->{transaction} || []}) {
message_input(N("Try installation even more strongly (--force)? (y/N) "), $force && $yesexpr) =~ /[$yesexpr]/
or ++$nok, next;
$urpm->{log}("starting force installing packages without deps");
- @l = $urpm->install($set->{remove} || [], \%transaction_sources_install, \%transaction_sources,
+ @l = $urpm->install(!$urpm->{options}{'allow-force'} && $set->{remove} || [],
+ \%transaction_sources_install, \%transaction_sources,
translate_message => 1, nodeps => 1, force => 1,
oldpackage => $state->{oldpackage}, post_clean_cache => $urpm->{options}{'post-clean'},
test => $test,