From af850add19d3aad10cd54534fad188ed94fe9290 Mon Sep 17 00:00:00 2001 From: "Robert P. Goldman" Date: Fri, 14 Oct 2016 12:55:12 -0500 Subject: [PATCH] Fix unused variable warning on Allegro. Reorganized the package-moving logic. Previously it mingled lines of code for allegro/non-allegro. Now the Allegro and non-Allegro lines are grouped together. This made it easier to deal with a LET binding unused on Allegro. --- upgrade.lisp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/upgrade.lisp b/upgrade.lisp index cda15041..db622808 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -37,12 +37,15 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO (when previous ;; Punt on upgrade from ASDF1 or ASDF2, by renaming (or deleting) the package. (when (version< previous "2.27") ;; 2.27 is the first to have the :asdf3 feature. + #-allegro (let ((away (format nil "~A-~A" :asdf previous))) - #-allegro (rename-package :asdf away) - #+allegro (delete-package :asdf) ;; rename-package fails badly on allegro + (rename-package :asdf away) (when *load-verbose* - #-allegro (format t "~&; Renamed old ~A package away to ~A~%" :asdf away) - #-allegro (format t "~&; Deleted old ~A package~%" :asdf)))) + (format t "~&; Renamed old ~A package away to ~A~%" :asdf away))) + #+allegro + (progn (delete-package :asdf) ;; rename-package fails badly on allegro + (when *load-verbose* + (format t "~&; Deleted old ~A package~%" :asdf)))) (list previous)))) ;; This public variable will be bound shortly to the currently loaded version of ASDF. (defvar *asdf-version* nil) -- GitLab