TakeV/spacemacs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes #315 error when a layer does not exist

Browse source
This commit is contained in:
syl20bnr 2014-12-21 21:58:00 -05:00
parent cf13afa0e4
commit 653a3416f5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/config-system.el
View file

@ -159,10 +159,8 @@ the following keys:
(base-dir (config-system/get-layer-path sym)) (base-dir (config-system/get-layer-path sym))
(dir (format "%s%s/" base-dir sym-name)) (dir (format "%s%s/" base-dir sym-name))
(ext-dir (format "%sextensions/" dir))) (ext-dir (format "%sextensions/" dir)))
(if (file-exists-p dir) (when (and base-dir (file-exists-p dir))
(cons sym (list :dir dir :ext-dir ext-dir)) (cons sym (list :dir dir :ext-dir ext-dir)))))
(spacemacs/message "Warning: layer %s does not exist in dir %s!"
sym-name dir))))
(defun config-system/get-layers-list () (defun config-system/get-layers-list ()
"Return a list of all discovered layer symbols." "Return a list of all discovered layer symbols."
@ -170,7 +168,9 @@ the following keys:
(defun config-system/get-layer-path (layer) (defun config-system/get-layer-path (layer)
"Return the path for LAYER symbol." "Return the path for LAYER symbol."
(ht-get config-system-layer-paths layer)) (let ((path (ht-get config-system-layer-paths layer)))
(unless path (spacemacs/message "Warning: Cannot find layer %s !" layer))
path))
(defun config-system/load-layers () (defun config-system/load-layers ()
"Load all declared layers." "Load all declared layers."