branch: elpa-admin
commit cdefe40f3d9dbf59c7dd7daf1373b6b6d7c2b0cc
Author: Michael Albinus <[email protected]>
Commit: Michael Albinus <[email protected]>
Improve copying of :core files; update .gitignore
* .gitignore: Add buffer-expose, dired-git-info, disk-usage, eev,
frog-menu, greader, guess-language, olivetti, peg, relint,
smalltalk-mode, tramp, and xr.
* admin/archive-contents.el (archive--core-package-link-file):
Quote target directory; Tramp test files contain special file
names. Append "/" to the target of copy-file, if this is a directory.
---
admin/archive-contents.el | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 3024543..de444e3 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -762,14 +762,18 @@ If WITH-CORE is non-nil, it means we manage :core
packages as well."
(expand-file-name dest package-root))
(absolute-core-file-name
(expand-file-name source emacs-repo-root))
- (directory (file-name-directory absolute-package-file-name)))
+ (directory
+ (file-name-quote (file-name-directory absolute-package-file-name))))
(unless (file-directory-p directory)
(make-directory directory t))
(condition-case nil
(make-symbolic-link absolute-core-file-name
absolute-package-file-name t)
(file-error
- (copy-file absolute-core-file-name absolute-package-file-name))))
+ (copy-file absolute-core-file-name
+ (if (file-directory-p absolute-package-file-name)
+ (file-name-as-directory absolute-package-file-name)
+ absolute-package-file-name)))))
(message " %s -> %s" source (if (archive--core-package-empty-dest-p dest)
(file-name-nondirectory source)
dest))))
