mirror of
https://github.com/correl/melpa.git
synced 2024-11-24 19:19:52 +00:00
Merge pull request #1850 from dieterdeyke/master
fossil 1.21 uses _FOSSIL_ instead of the newer fslckout to store local data
This commit is contained in:
commit
49b61d99ed
1 changed files with 3 additions and 1 deletions
|
@ -333,7 +333,8 @@ seconds; the server cuts off after 10 requests in 20 seconds.")
|
|||
(let ((repo (plist-get config :url)))
|
||||
(with-current-buffer (get-buffer-create "*package-build-checkout*")
|
||||
(cond
|
||||
((and (file-exists-p (expand-file-name ".fslckout" dir))
|
||||
((and (or (file-exists-p (expand-file-name ".fslckout" dir))
|
||||
(file-exists-p (expand-file-name "_FOSSIL_" dir)))
|
||||
(string-equal (pb/fossil-repo dir) repo))
|
||||
(pb/princ-exists dir)
|
||||
(pb/run-process dir "fossil" "update"))
|
||||
|
@ -598,6 +599,7 @@ Optionally PRETTY-PRINT the data."
|
|||
"--exclude=.git*"
|
||||
"--exclude=_darcs"
|
||||
"--exclude=.fslckout"
|
||||
"--exclude=_FOSSIL_"
|
||||
"--exclude=.bzr"
|
||||
"--exclude=.hg"
|
||||
(or (mapcar (lambda (fn) (concat dir "/" fn)) files) (list dir))))
|
||||
|
|
Loading…
Reference in a new issue