[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin 5067b05 258/357: Change to package directory before ch
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin 5067b05 258/357: Change to package directory before checking .elpaignore exclusions. |
Date: |
Thu, 10 Dec 2020 18:06:54 -0500 (EST) |
branch: elpa-admin
commit 5067b052d61b344aad7a6683df441811bac5e022
Author: Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
Commit: Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
Change to package directory before checking .elpaignore exclusions.
If we don't do this, the package's directory's name is included in the file
names that are checked for .elpaignore matches. .elpaignore matches should
be
assumed to occur inside the package's directory.
---
GNUmakefile | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 6d57fae..8edb2f8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -150,13 +150,18 @@ $(foreach al, $(autoloads), $(eval $(call RULE-srcdeps,
$(al))))
included_els := $(shell \
for pt in packages/*; do \
if [ -d $$pt ]; then \
- if [ -f "$${pt}/.elpaignore" ]; then \
- tar -ch $$pt/*.el --no-recursion \
- --exclude-vcs -X "$${pt}/.elpaignore" \
+ prev=$$(pwd); \
+ cd $$pt; \
+ if [ -f .elpaignore ]; then \
+ tar -ch *.el --no-recursion \
+ --exclude-vcs -X .elpaignore \
| tar --list; \
else \
- ls -1 $$pt/*.el; \
- fi; \
+ ls -1 *.el; \
+ fi | while read line; \
+ do echo "$${pt}/$${line}"; \
+ done; \
+ cd $$prev; \
fi; \
done)
els := $(call FILTER-nonsrc, $(included_els))
- [elpa] elpa-admin 9ab6e7e 217/357: Update packages/yasnippet by subtree-merging from its external upstream, (continued)
- [elpa] elpa-admin 9ab6e7e 217/357: Update packages/yasnippet by subtree-merging from its external upstream, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin f1c2e2f 210/357: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa: transcribe.el update, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 0d7eb99 235/357: Add 'packages/realgud/' from commit 'b7a7fe924217931332915d457928c6851db4a636', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin b14148a 249/357: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 8208d1c 245/357: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 299da86 255/357: Package pages improvements, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin ec13cc2 260/357: Let ert-support.el work for subdirectories, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 294407d 256/357: README: Fix copyright years., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5250761 270/357: * admin/archive-contents.el: Use `git worktree` for externals, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 334aa51 273/357: Merge commit 'a1130df3ada34e76675324a8c25823b420b20239', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5067b05 258/357: Change to package directory before checking .elpaignore exclusions.,
Stefan Monnier <=
- [elpa] elpa-admin 82a2bda 259/357: Put tar'd files at the end to fix build in some environments., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 7626ffa 254/357: Website footer improvement, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin dbd4e0b 295/357: Merge remote-tracking branch 'refs/remotes/origin/master', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 02d8431 297/357: * admin/archive-contents.el (archive--insert-repolinks): Fix further yet, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 38e81a8 300/357: * README: Recommend "externals" and add some recommendations, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a216465 299/357: * admin/archive-contents.el (archive--insert-repolinks): Whoops, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 0e7eab5 304/357: Merge commit 'facd92f4c026525706a48b96b4e0b24543ce1d94', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 75bab1c 309/357: * admin/archive-contents.el: Fix case of non-versions dependencies, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 86e31b7 313/357: Merge branch 'master' of git://bzr.sv.gnu.org/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 973ee9d 314/357: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10