From 2a1c9b4e57b0d1d2c2cbf0144ea577d99fdd9973 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Wed, 24 Jun 2009 14:33:18 +0000 Subject: [PATCH] 1.0.29.35: regression from 1.0.29.27 * If the runtime namestring is not available, don't try to parse it. * Reported by Josh Elsasser. --- src/code/common-os.lisp | 3 ++- version.lisp-expr | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/code/common-os.lisp b/src/code/common-os.lisp index 51ebbc1..7b32419 100644 --- a/src/code/common-os.lisp +++ b/src/code/common-os.lisp @@ -43,5 +43,6 @@ (setf *core-pathname* (merge-pathnames (native-pathname *core-string*))) (/show0 "setting *RUNTIME-PATHNAME*") - (setf *runtime-pathname* (native-pathname (os-get-runtime-executable-path))) + (let ((exe (os-get-runtime-executable-path))) + (setf *runtime-pathname* (when exe (native-pathname exe)))) (/show0 "leaving OS-COLD-INIT-OR-REINIT")) diff --git a/version.lisp-expr b/version.lisp-expr index 10c7499..fedfda1 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".) -"1.0.29.34" +"1.0.29.35" -- 1.7.10.4