gitback/el-get
1
0
Fork 0
mirror of https://github.com/dimitri/el-get.git synced 2024-09-29 04:58:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

el-get-bundle: merge :depends with original recipe

Browse Source 
Let entries specified in :depends list be merged with dependencies in
the original recipe (instead of overriding it), just like the :features
list.

close #2340
This commit is contained in:
Enze Chi 2016-03-10 09:29:23 +11:00 committed by Noam Postavsky
parent 9bc149f1c7
commit 2574344f76
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
el-get-bundle.el
View File

@ -153,12 +153,20 @@
;;;###autoload
(defun el-get-bundle-el-get (src)
(let ((package (plist-get src :name)) (def (el-get-bundle-package-def src))
(fs (plist-get src :features)) (sync 'sync))
(fs (plist-get src :features))
(ds (plist-get src :depends))
(sync 'sync))
;; merge features
(when (plist-member def :features)
(let ((old (el-get-as-list (plist-get def :features))))
(dolist (f old) (add-to-list 'fs f))
(setq src (plist-put src :features fs))))
;; merge depends
(when (plist-member def :depends)
(let ((old (el-get-as-list (plist-get def :depends))))
(dolist (d old) (add-to-list 'ds d))
(setq src (plist-put src :depends ds))))
;; merge src with the oriiginal definition
(setq def (let ((el-get-sources (list src)))
(el-get-package-def (el-get-source-name src))))