summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2015-04-11 17:47:33 -0400
committerDavid Thompson <dthompson2@worcester.edu>2015-04-11 17:47:33 -0400
commit33d7c84e882704b7afd081dce9e7f515bd6f7dc2 (patch)
tree4c9597b8d3fcba35e432a99497c13a8ec7ad8407
parent40b824255497aee0e435a7cb8fae55548d9cc700 (diff)
ui: Fix load-config.
* haunt/ui.scm (load-config): Use an absolute path when calling 'load'. Fix typo in error message.
-rw-r--r--haunt/ui.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/haunt/ui.scm b/haunt/ui.scm
index e19a15b..3b77bd2 100644
--- a/haunt/ui.scm
+++ b/haunt/ui.scm
@@ -31,6 +31,7 @@
#:use-module (srfi srfi-37)
#:use-module (haunt config)
#:use-module (haunt site)
+ #:use-module (haunt utils)
#:export (program-name
show-version-and-exit
simple-args-fold
@@ -104,11 +105,11 @@ There is NO WARRANTY, to the extent permitted by law.~%"
(define* (load-config file-name)
"Load configuration from FILE-NAME."
(if (file-exists? file-name)
- (let ((obj (load file-name)))
+ (let ((obj (load (absolute-file-name file-name))))
(if (site? obj)
obj
(leave "configuration object must be a site, got: ~a" obj)))
- (leave "configuration file found: ~a" file-name)))
+ (leave "configuration file not found: ~a" file-name)))
(define (run-haunt-command command . args)
(let* ((module