From fb84bc21faa171ba677480f02b0f770fcfef2a38 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Fri, 18 Jan 2013 02:00:20 -0500 Subject: [PATCH] 2.26.108: fix the "new export" case of define-package. --- asdf.asd | 2 +- header.lisp | 2 +- package.lisp | 22 +++++++++++----------- upgrade.lisp | 2 +- version.lisp-expr | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/asdf.asd b/asdf.asd index d39e24eb6..b90b834af 100644 --- a/asdf.asd +++ b/asdf.asd @@ -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)))) diff --git a/header.lisp b/header.lisp index 852471477..16e2c16cb 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;; -*- 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>. diff --git a/package.lisp b/package.lisp index b88d05b6b..e2373cfc7 100644 --- a/package.lisp +++ b/package.lisp @@ -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 diff --git a/upgrade.lisp b/upgrade.lisp index 7c1da76eb..c63a2e8d5 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -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))) diff --git a/version.lisp-expr b/version.lisp-expr index 99a188ff3..1c0dcc57b 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.26.108" +"2.26.109" -- GitLab