X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf%2Fasdf.lisp;h=4005dc83fac1473ed79c337025286e5564108676;hb=a8a79584f77a1ca0b1f651c27d219678e44c3f4d;hp=05512de8e046b7e2b73e34ba62a48791b81dd0ac;hpb=e0f4c934a141cc3d95628f53cbcbc011a471b474;p=sbcl.git diff --git a/contrib/asdf/asdf.lisp b/contrib/asdf/asdf.lisp index 05512de..4005dc8 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