From f1f3f5372647f1266c29eff07be9c111dd15fe9c Mon Sep 17 00:00:00 2001 From: "Robert P. Goldman" <rpgoldman@real-time.com> Date: Wed, 17 Mar 2010 20:49:15 -0500 Subject: [PATCH] Removed unused code causing tests to fail. In system-configuration-directories the FLET function was only run on windows. On non-windows, at least on ACL, this was causing compilation warnings, and hence test failures. Juggled the position of the #+windows to fix this. --- asdf.lisp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/asdf.lisp b/asdf.lisp index d3d23041..0c97f34e 100644 --- a/asdf.lisp +++ b/asdf.lisp @@ -2187,13 +2187,15 @@ output to `*verbose-out*`. Returns the shell's exit code." (defun system-configuration-directories () (remove-if #'null - (flet ((try (x sub) (try-directory-subpath x sub :type :directory))) - `(#+windows + (append + #+windows + (flet ((try (x sub) (try-directory-subpath x sub :type :directory))) + `( ,@`(#+lispworks ,(try (sys:get-folder-path :local-appdata) "common-lisp/config/") ;;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Common AppData #+(not cygwin) - ,(try (getenv "ALLUSERSPROFILE") "Application Data/common-lisp/config/")) - #p"/etc/")))) + ,(try (getenv "ALLUSERSPROFILE") "Application Data/common-lisp/config/")))) + (list #p"/etc/")))) (defun in-first-directory (dirs x) (loop :for dir :in dirs :thereis (and dir (ignore-errors (truename (merge-pathnames* x (ensure-directory-pathname dir))))))) -- GitLab