Commit dc100e7e authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

2.26.170: have delete-file-if-exists be nice when passed NIL.

Also, intern fishy symbols that are imported but missing from original package.
parent 3bc805a3
......@@ -66,7 +66,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.26.169" ;; to be automatically updated by make bump-version
:version "2.26.170" ;; to be automatically updated by make bump-version
:depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8
;; For most purposes, asdf itself specially counts as a builtin system.
......
......@@ -463,6 +463,6 @@ TRUENAMIZE uses TRUENAMIZE to resolve as many symlinks as possible."
#+clozure :if-exists #+clozure :rename-and-delete))
(defun* delete-file-if-exists (x)
(handler-case (delete-file x) (file-error () nil)))
(when x (handler-case (delete-file x) (file-error () nil))))
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.26.169: Another System Definition Facility.
;;; This is ASDF 2.26.170: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
......@@ -363,7 +363,11 @@ or when loading the package is optional."
(check-type from-package package)
(check-type shadowed hash-table)
(check-type imported hash-table)
(let* ((import-me (find-symbol* name from-package)))
(multiple-value-bind (import-me import-status) (find-symbol name from-package)
(when (null import-status)
(note-package-fishiness
:import-uninterned name (package-name from-package) (package-name to-package))
(setf import-me (intern name from-package)))
(multiple-value-bind (existing status) (find-symbol name to-package)
(cond
((gethash name imported)
......
......@@ -51,7 +51,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO
;; "3.4.5.67" would be a development version in the official upstream of 3.4.5.
;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5
;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
(asdf-version "2.26.169")
(asdf-version "2.26.170")
(existing-version (asdf-version)))
(setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-version)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment