r1996: logical pathname fixes

diff --git a/clsql.system b/clsql.system
index f8143c175eb2f150ea55e60b7d28cf654a92b2e1..976ca20fa61ae19126206572baf3c34ac66399a5 100644 (file)
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.9 2002/05/13 00:45:10 kevin Exp $
+;;;; $Id: clsql.system,v 1.10 2002/05/13 00:57:42 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,11 +19,8 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :cl-user)
 
-(handler-case
-    (logical-pathname-translations "CL-LIBRARY")
-  (error ()
-      (load (make-pathname :name "set-cl-library" :type "cl"
-                          :defaults *load-truename*))))
+(load (make-pathname :name "set-cl-library" :type "cl"
+                    :defaults *load-truename*))
 
 ;;; System definitions
 

diff --git a/set-cl-library.cl b/set-cl-library.cl
index 51aa42ef5624e2647b9b0750a4bd405e584e1a54..fc9e6fc82785be2c0db306321a8a861e8573ba06 100644 (file)
--- a/set-cl-library.cl
+++ b/set-cl-library.cl
@@ -20,12 +20,26 @@
 (handler-case
     (logical-pathname-translations "CL-LIBRARY")
   (error ()
-    (let* ((dir (pathname-directory *load-truename*))
-          (parent-dir (subseq dir 0 (1- (length dir)))))
-      (load (make-pathname :name "set-logical" :type "cl"
-                          :defaults *load-truename*))
-      (set-logical-host-for-pathname 
-       "CL-LIBRARY" 
-       (make-pathname :host (pathname-host *load-truename*)
-                     :device (pathname-device *load-truename*)
-                     :directory parent-dir)))))
+        (let* ((dir (pathname-directory *load-truename*))
+               (parent-dir (subseq dir 0 (1- (length dir)))))
+          (load (make-pathname :name "set-logical" :type "cl"
+                               :defaults *load-truename*))
+          (set-logical-host-for-pathname 
+           "CL-LIBRARY" 
+           (make-pathname :host (pathname-host *load-truename*)
+                          :device (pathname-device *load-truename*)
+                          :directory parent-dir))))
+  (:no-error (translation)
+            ;; Make sure that CL-LIBRARY points to this installation
+            (let* ((dir (pathname-directory *load-truename*))
+                   (base-dir (car (last dir)))
+                   (logical-dir (translate-logical-pathname 
+                                 (concatenate 'string
+                                              "CL-LIBRARY:" base-dir ";"))))
+              (unless (equalp dir (pathname-directory logical-dir))
+                (error 
+                 (format nil "~S does not equal ~S"
+                         dir (pathname-directory logical-dir)))))))
+                       
+
+            ))