diff options
author | Guillaume Cottenceau <gc@mandriva.com> | 2002-09-06 14:26:12 +0000 |
---|---|---|
committer | Guillaume Cottenceau <gc@mandriva.com> | 2002-09-06 14:26:12 +0000 |
commit | 547d585586bfc0a958a633fe4196d41989656c62 (patch) | |
tree | ef12a10ea58f6b8a77983ec0cef88bf8c7975b7c | |
parent | 6d5993829140f42d0d9fbca394de7b9bc13f0744 (diff) | |
download | rpmdrake-547d585586bfc0a958a633fe4196d41989656c62.tar rpmdrake-547d585586bfc0a958a633fe4196d41989656c62.tar.gz rpmdrake-547d585586bfc0a958a633fe4196d41989656c62.tar.bz2 rpmdrake-547d585586bfc0a958a633fe4196d41989656c62.tar.xz rpmdrake-547d585586bfc0a958a633fe4196d41989656c62.zip |
fix impossibility of install packages after user refuses one time
to remove some packages to allow others to be upgraded (fake
modality sucking)
-rwxr-xr-x | rpmdrake | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -605,8 +605,8 @@ or you already installed all of them.")); my $do_action = sub { $fake_modality and return; - $fake_modality = 1; int(grep { $pkgs->{$_}{selected} } keys %$pkgs) or return; + $fake_modality = 1; my $size_added = sum(map { if_($_->flag_selected && !$_->flag_installed, $_->size) } @{$urpm->{depslist}}); if ($MODE eq 'install' && $size_free - $size_added/1024 < 50*(1024)) { interactive_msg(_("Too many packages are selected"), @@ -616,7 +616,7 @@ during or after package installation ; this is particularly dangerous and should be considered with care. Do you really want to install all the selected packages?"), yesno => 1) - or return; + or $fake_modality = 0, return; } if ($MODE ne 'remove' && %{$urpm->{state}{ask_remove} || {}}) { interactive_msg(_("Some packages need to be removed"), @@ -625,7 +625,7 @@ _("The following packages have to be removed for others to be upgraded: %s Is it ok to continue?", $formatlistpkg->(sort { $a cmp $b } keys %{$urpm->{state}{ask_remove}})), yesno => 1) - or return; + or $fake_modality = 0, return; } $callback_action->($urpm, $pkgs); ($urpm, $pkgs, $descriptions) = $pkgs_provider->({ skip_updating_mu => 1 }); |