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

2.26.108: fix the "new export" case of define-package.

parent 002eb570
......@@ -15,7 +15,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.26.108" ;; to be automatically updated by bin/bump-revision
:version "2.26.109" ;; to be automatically updated by bin/bump-revision
:depends-on ()
:components ((:module "build" :components ((:file "asdf"))))
:in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op generate-asdf))))
......
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; This is ASDF 2.26.108: Another System Definition Facility.
;;; This is ASDF 2.26.109: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
......@@ -468,17 +468,17 @@ or when loading the package is optional."
(multiple-value-bind (usym ustat) (find-symbol name u)
(unless (and ustat (eq sym usym))
(let ((accessible
(when ustat
(let ((shadowing (symbol-shadowing-p usym u))
(recycled (symbol-recycled-p usym)))
(unless (and shadowing (not recycled))
(if (or (eq ustat :inherited) shadowing)
(shadowing-import sym u)
(unintern usym u))
(fishy :ensure-export name (symbol-package-name sym)
(package-name u)
(and ustat (symbol-package-name usym)) ustat shadowing)
t)))))
(or (null ustat)
(let ((shadowing (symbol-shadowing-p usym u))
(recycled (symbol-recycled-p usym)))
(unless (and shadowing (not recycled))
(fishy :ensure-export name (symbol-package-name sym)
(package-name u)
(and ustat (symbol-package-name usym)) ustat shadowing)
(if (or (eq ustat :inherited) shadowing)
(shadowing-import sym u)
(unintern usym u))
t)))))
(when (and accessible (eq ustat :external))
(ensure-exported name sym u)))))))
#-gcl (setf (documentation package t) documentation) #+gcl documentation
......
......@@ -45,7 +45,7 @@
;; "2.345.6" would be a development version in the official upstream
;; "2.345.0.7" would be your seventh local modification of official release 2.345
;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
(asdf-version "2.26.108")
(asdf-version "2.26.109")
(existing-asdf (find-class (find-symbol* :component :asdf nil) nil))
(existing-version *asdf-version*)
(already-there (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