github/melpa
1
0
Fork 0
mirror of https://github.com/correl/melpa.git synced 2024-11-24 19:19:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1850 from dieterdeyke/master

Browse source 
fossil 1.21 uses _FOSSIL_ instead of the newer fslckout to store local data
This commit is contained in:
Steve Purcell 2014-07-10 11:52:38 +01:00
commit 49b61d99ed
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package-build.el
View file

@ -333,7 +333,8 @@ seconds; the server cuts off after 10 requests in 20 seconds.")
(let ((repo (plist-get config :url))) (let ((repo (plist-get config :url)))
(with-current-buffer (get-buffer-create "*package-build-checkout*") (with-current-buffer (get-buffer-create "*package-build-checkout*")
(cond (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)) (string-equal (pb/fossil-repo dir) repo))
(pb/princ-exists dir) (pb/princ-exists dir)
(pb/run-process dir "fossil" "update")) (pb/run-process dir "fossil" "update"))
@ -598,6 +599,7 @@ Optionally PRETTY-PRINT the data."
"--exclude=.git*" "--exclude=.git*"
"--exclude=_darcs" "--exclude=_darcs"
"--exclude=.fslckout" "--exclude=.fslckout"
"--exclude=_FOSSIL_"
"--exclude=.bzr" "--exclude=.bzr"
"--exclude=.hg" "--exclude=.hg"
(or (mapcar (lambda (fn) (concat dir "/" fn)) files) (list dir)))) (or (mapcar (lambda (fn) (concat dir "/" fn)) files) (list dir))))