summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-14 13:08:46 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-14 13:08:46 +0000
commitd84a8cd9f7b9399257e56b1c4f0265de41279826 (patch)
treed45930b0ceaa09f1ed69fb9e183216d66ac30f06
parent3fa9701aad76a10e192e0675db371d76aac11a85 (diff)
downloadurpmi-d84a8cd9f7b9399257e56b1c4f0265de41279826.tar
urpmi-d84a8cd9f7b9399257e56b1c4f0265de41279826.tar.gz
urpmi-d84a8cd9f7b9399257e56b1c4f0265de41279826.tar.bz2
urpmi-d84a8cd9f7b9399257e56b1c4f0265de41279826.tar.xz
urpmi-d84a8cd9f7b9399257e56b1c4f0265de41279826.zip
(ask_choice) fix exit code if canceling when requested to select a choice
-rw-r--r--NEWS1
-rwxr-xr-xgurpmi22
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index d79f4f28..b97f5ef8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- gurpmi
+ o fix exit code if canceling when requested to select a choice
o fix exit code if not refusing to insert the proper media
o notify callers when installation is canceled (#40358)
diff --git a/gurpmi2 b/gurpmi2
index 52994fb8..7fc0ae27 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -179,7 +179,7 @@ sub ask_choice {
foreach (@radios) { last if $_->get_active; ++$n }
}
$d->destroy;
- exit(0) if $_[1] == 0; #- "cancel"
+ exit(1) if $_[1] == 0; #- "cancel"
});
$radios[0]->set_active(1);
$d->set_default_response(1); # defaults to ok