emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master 08e065b: Improve copying of :core files; update .gitignore


From: Michael Albinus
Subject: [elpa] master 08e065b: Improve copying of :core files; update .gitignore
Date: Tue, 30 Apr 2019 10:36:12 -0400 (EDT)

branch: master
commit 08e065bd32c9bcb162f9117c3e30b9f9bdcafd87
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    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.
---
 .gitignore                | 14 ++++++++++++++
 admin/archive-contents.el |  8 ++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7fcb315..6148f04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,18 +12,25 @@ packages/*/*-pkg.el
 # External packages with their own .git tree [autogenerated].
 packages/auctex/
 packages/bbdb/
+packages/buffer-expose/
 packages/chess/
 packages/cl-print/
 packages/clipboard-collector/
 packages/dash/
+packages/dired-git-info/
+packages/disk-usage/
 packages/dismal/
 packages/ebdb/
+packages/eev/
 packages/eglot/
 packages/ergoemacs-mode/
 packages/exwm/
 packages/flymake/
 packages/fountain-mode/
+packages/frog-menu/
 packages/gpastel/
+packages/greader/
+packages/guess-language/
 packages/hyperbole/
 packages/ivy-explorer/
 packages/jsonrpc/
@@ -32,19 +39,26 @@ packages/map/
 packages/mmm-mode/
 packages/ntlm/
 packages/objed/
+packages/olivetti/
 packages/omn-mode/
 packages/orgalist/
 packages/pabbrev/
+packages/peg/
 packages/posframe/
 packages/psgml/
 packages/python/
+packages/relint/
 packages/rudel/
+packages/smalltalk-mode/
 packages/soap-client/
 packages/sql-indent/
 packages/ssh-deploy/
 packages/system-packages/
+packages/tramp/
 packages/w3/
+packages/webfeeder/
 packages/xelb/
+packages/xr/
 packages/zones/
 
 # Testing file
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))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]