summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-14 13:13:29 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-14 13:13:29 +0000
commit9a1715b95a8198a948659071eed9c204d4b34870 (patch)
treea0a60914deb86a07247dc3061c62b8f86624cff4
parent5b1332c3edd262ee8ea8dcab557edd68d3fb65ea (diff)
downloadurpmi-9a1715b95a8198a948659071eed9c204d4b34870.tar
urpmi-9a1715b95a8198a948659071eed9c204d4b34870.tar.gz
urpmi-9a1715b95a8198a948659071eed9c204d4b34870.tar.bz2
urpmi-9a1715b95a8198a948659071eed9c204d4b34870.tar.xz
urpmi-9a1715b95a8198a948659071eed9c204d4b34870.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 a30995f1..37e10d9c 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 refusing to insert the proper media
o notify callers when installation is canceled (#40358)
- urpmi
diff --git a/gurpmi2 b/gurpmi2
index 717e6aff..a7b1defb 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -174,7 +174,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