0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-16 07:16:32 +00:00

Fix lockfile/symlink problem in org-publish.

Richard Riley and Sebastian Rose hunted down this bug.
This commit is contained in:
Carsten Dominik 2008-10-27 07:44:12 +01:00
parent 0df8bfb77c
commit 8c022e1b72
2 changed files with 7 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2008-10-27 Carsten Dominik <dominik@science.uva.nl>
* org-publish.el (org-publish-get-base-files-1): Deal correctly
with broken symlinks
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-exp.el (org-export-select-tags, org-get-current-options):

View file

@ -427,7 +427,7 @@ MATCH. If SKIP-FILE is non-nil, skip file matching the regexp
SKIP-FILE. If SKIP-DIR is non-nil, don't check directories
matching the regexp SKIP-DIR when recursiing through BASE-DIR."
(mapc (lambda (f)
(let ((fd-p (car (file-attributes f)))
(let ((fd-p (file-directory-p f))
(fnd (file-name-nondirectory f)))
(if (and fd-p recurse
(not (string-match "^\\.+$" fnd))
@ -435,6 +435,7 @@ matching the regexp SKIP-DIR when recursiing through BASE-DIR."
(org-publish-get-base-files-1 f recurse match skip-file skip-dir)
(unless (or fd-p ;; this is a directory
(and skip-file (string-match skip-file fnd))
(not (file-exists-p (file-truename f)))
(not (string-match match fnd)))
(pushnew f org-publish-temp-files)))))
(directory-files base-dir t (unless recurse match))))