summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-06 16:13:32 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-06 16:13:32 +0000
commit1baaa25012303e6a6c2772e39598eab5a54002ee (patch)
treeff6c441964643f297340de01ebda81f0589b82a7
parentb2ebbbf918bc8eebc2448d6f569a92b5ec1d9150 (diff)
downloadurpmi-1baaa25012303e6a6c2772e39598eab5a54002ee.tar
urpmi-1baaa25012303e6a6c2772e39598eab5a54002ee.tar.gz
urpmi-1baaa25012303e6a6c2772e39598eab5a54002ee.tar.bz2
urpmi-1baaa25012303e6a6c2772e39598eab5a54002ee.tar.xz
urpmi-1baaa25012303e6a6c2772e39598eab5a54002ee.zip
(do_install_3) do not exit in --auto mode at end of installation which prevents
restarting after priority upgrade
-rw-r--r--NEWS3
-rwxr-xr-xgurpmi22
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 6fc5514a..b9531944 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
- library:
o pass "replacefiles" to rpmlib (will be used by mdkonline)
+- gurpmi:
+ o do not exit in --auto mode at end of installation which prevents
+ restarting after priority upgrade
- urpmi, rpmdrake:
o nice exit code for "bad signature" fatal error. Fixes rpmdrake continuing
on bad signature (#44575)
diff --git a/gurpmi2 b/gurpmi2
index 944c2a15..1301c6d1 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -317,7 +317,7 @@ sub do_install_3 () {
urpm::removable::try_umounting_removables($urpm);
$vbox = Gtk2::VBox->new(0, 5);
$progress_label = Gtk2::Label->new('-');
- exit 0 if $gurpmi::options{auto};
+ return 0 if $gurpmi::options{auto};
my $sw = create_scrolled_window($progress_label);
$sw->set_size_request(500, 200);
$vbox->pack_start($sw, 1, 1, 0);