1.0.36.25: stuff silly putty into pipe to stop ASDF-INSTALL leaking

 * ...or the moral equivalent thereof.

diff --git a/NEWS b/NEWS
index bb43caf..5a97866 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,8 @@ changes relative to sbcl-1.0.36:
     declarations (lp#497321)
   * bug fix: FIND and POSITION on lists did not check sequence bounds properly
     and failed to detect circular lists (lp#452008)
+  * bug fix: leakage from ~/.asdf-install into the ASDf-INSTALL contrib build
+    (lp#538974)
 
 changes in sbcl-1.0.36 relative to sbcl-1.0.35:
   * new feature: SB-EXT:TYPEXPAND-1, SB-EXT:TYPEXPAND, and

diff --git a/contrib/asdf-install/installer.lisp b/contrib/asdf-install/installer.lisp
index b55532a..7aaf04d 100644 (file)
--- a/contrib/asdf-install/installer.lisp
+++ b/contrib/asdf-install/installer.lisp
@@ -33,11 +33,13 @@
      ,(merge-pathnames "systems/" *dot-sbcl*)
      "Personal installation")))
 
-(let* ((*package* (find-package :asdf-install-customize))
-       (file (probe-file (merge-pathnames
-                          (make-pathname :name ".asdf-install")
-                          (user-homedir-pathname)))))
-  (when file (load file)))
+(unless (sb-ext:posix-getenv "SBCL_BUILDING_CONTRIB")
+  ;; Not during build, thanks.
+  (let* ((*package* (find-package :asdf-install-customize))
+         (file (probe-file (merge-pathnames
+                            (make-pathname :name ".asdf-install")
+                            (user-homedir-pathname)))))
+    (when file (load file))))
 
 (define-condition download-error (error)
   ((url :initarg :url :reader download-url)

diff --git a/version.lisp-expr b/version.lisp-expr
index bb03be7..240c8c6 100644 (file)
--- 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.36.24"
+"1.0.36.25"