~ chicken-core (chicken-5) 81ac8985e53e0e5c4d1728b62bd15369a2485d71
commit 81ac8985e53e0e5c4d1728b62bd15369a2485d71
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Thu Oct 7 04:27:28 2010 -0400
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Thu Oct 7 04:27:28 2010 -0400
abort actually does abort (thanks to c-keen)
diff --git a/chicken-install.scm b/chicken-install.scm
index aad78692..9583541e 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -356,7 +356,7 @@
(yes-or-no?
(make-replace-extension-question e+d+v upgrade)
"no"
- abort: abort-setup) ) )
+ abort: (abort-setup) ) ) )
(let ([ueggs (unzip1 upgrade)])
(print " upgrade: " (string-intersperse ueggs ", "))
(for-each
@@ -461,7 +461,7 @@
(string-append
"You specified `-no-install', but this extension has dependencies"
" that are required for building.\nDo you still want to install them?")
- abort: abort-setup)))
+ abort: (abort-setup))))
(print "aborting installation.")
(cleanup)
(exit 1)))
diff --git a/chicken-uninstall.scm b/chicken-uninstall.scm
index bd6b35ee..0951b3e6 100644
--- a/chicken-uninstall.scm
+++ b/chicken-uninstall.scm
@@ -76,7 +76,7 @@
(map (cut string-append " " <> "\n") eggs)
'("\nDo you want to proceed?")))
default: "no"
- abort: abort-setup)))
+ abort: (abort-setup))))
(define (uninstall pats)
(let ((eggs (gather-eggs pats)))
diff --git a/utils.scm b/utils.scm
index 2ef1b330..8e4d8b08 100644
--- a/utils.scm
+++ b/utils.scm
@@ -195,7 +195,7 @@ C_confirmation_dialog(char *msg, char *caption, int def, int abort) { return -1;
((and abort (string-ci=? "abort" ln)) (abort))
(else
(if abort
- (printf "~%Please enter \"yes\" or \"no\".~%")
- (printf "~%Please enter \"yes\", \"no\" or \"abort\".~%"))
+ (printf "~%Please enter \"yes\", \"no\" or \"abort\".~%")
+ (printf "~%Please enter \"yes\" or \"no\".~%"))
(loop) ) ) ) ) ) ) ) )
Trap