From d43f45c63d6b9257aab54f7773d661431ac9d52d Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Tue, 7 Nov 2006 10:51:39 +0000 Subject: [PATCH] 0.9.18.39: ASDF update: better SBCL_HOME handling. --- contrib/asdf/asdf.lisp | 31 +++++++++++++++++-------------- version.lisp-expr | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/contrib/asdf/asdf.lisp b/contrib/asdf/asdf.lisp index 05512de8e..4005dc83f 100644 --- a/contrib/asdf/asdf.lisp +++ b/contrib/asdf/asdf.lisp @@ -1,4 +1,4 @@ -;;; This is asdf: Another System Definition Facility. 1.101 +;;; This is asdf: Another System Definition Facility. 1.102 ;;; ;;; Feedback, bug reports, and patches are all welcome: please mail to ;;; . But note first that the canonical @@ -112,7 +112,7 @@ (in-package #:asdf) -(defvar *asdf-revision* (let* ((v "1.101") +(defvar *asdf-revision* (let* ((v "1.102") (colon (or (position #\: v) -1)) (dot (position #\. v))) (and v colon dot @@ -1190,20 +1190,23 @@ output to *VERBOSE-OUT*. Returns the shell's exit code." t)))) (defun contrib-sysdef-search (system) - (let* ((name (coerce-name system)) - (home (truename (sb-ext:posix-getenv "SBCL_HOME"))) - (contrib (merge-pathnames - (make-pathname :directory `(:relative ,name) - :name name - :type "asd" - :case :local - :version :newest) - home))) - (probe-file contrib))) + (let ((home (sb-ext:posix-getenv "SBCL_HOME"))) + (when home + (let* ((name (coerce-name system)) + (home (truename home)) + (contrib (merge-pathnames + (make-pathname :directory `(:relative ,name) + :name name + :type "asd" + :case :local + :version :newest) + home))) + (probe-file contrib))))) (pushnew - '(merge-pathnames "site-systems/" - (truename (sb-ext:posix-getenv "SBCL_HOME"))) + '(let ((home (sb-ext:posix-getenv "SBCL_HOME"))) + (when home + (merge-pathnames "site-systems/" (truename home)))) *central-registry*) (pushnew diff --git a/version.lisp-expr b/version.lisp-expr index 78e913e75..a93029ba5 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.18.38" +"0.9.18.39" -- 2.11.4.GIT