diff options
author | Francois Pons <fpons@mandriva.com> | 2002-01-18 10:08:04 +0000 |
---|---|---|
committer | Francois Pons <fpons@mandriva.com> | 2002-01-18 10:08:04 +0000 |
commit | f87dd8d01e35b6634154007f5067849c46ef127d (patch) | |
tree | 2bc15f7af6d11cc00b234b12c7bdd7b7f9417246 | |
parent | d861e03457f61ed2894f68bf841805441d9a192b (diff) | |
download | drakx-f87dd8d01e35b6634154007f5067849c46ef127d.tar drakx-f87dd8d01e35b6634154007f5067849c46ef127d.tar.gz drakx-f87dd8d01e35b6634154007f5067849c46ef127d.tar.bz2 drakx-f87dd8d01e35b6634154007f5067849c46ef127d.tar.xz drakx-f87dd8d01e35b6634154007f5067849c46ef127d.zip |
allow cancel when installUpdates.
-rw-r--r-- | perl-install/install_steps_interactive.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index e6696394c..ec8a4b4d9 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -916,7 +916,7 @@ Do you want to install the updates ?"))) || return; \@mirrors, $u->{mirror}); }; - return if $@; + return if $@ || !$u->{mirror}; my $update_medium = do { my $w = $o->wait_message('', _("Contacting the mirror to get the list of available packages")); @@ -927,6 +927,10 @@ Do you want to install the updates ?"))) || return; if ($o->choosePackagesTree($o->{packages}, $update_medium)) { $o->pkg_install; $o->install_urpmi; + } else { + #- make sure to not try to install the packages (which are automatically selected by getPackage above). + #- this is possible by deselecting the medium (which can be re-selected above). + delete $update_medium->{select}; } } |