branch: elpa/helm commit c5346e10ddc7fc00a79db1a49ea8f357016fbf38 Author: Thierry Volpiatto <thie...@posteo.net> Commit: Thierry Volpiatto <thie...@posteo.net>
Change signature of helm-packages-fetch-recipe Use directly url after computing it in helm-packages-get-package-url. --- helm-packages.el | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/helm-packages.el b/helm-packages.el index bfab48faa3..d4bb0bd1f2 100644 --- a/helm-packages.el +++ b/helm-packages.el @@ -238,32 +238,32 @@ Arg PACKAGES is a list of strings." ;;; Cloning packages ;; -(defun helm-packages-fetch-recipe (provider) - (let ((address (assoc-default provider helm-packages-recipes-alist))) - (with-temp-buffer - (url-insert-file-contents address) - (goto-char (point-min)) - (let ((data (read (current-buffer)))) - ;; Recipes do not have the same form depending from - ;; where we fetch them, they may be like - ;; ((foo :url "somewhere") - ;; (bar :url "somewhere")) - ;; or - ;; (((foo :url "somewhere") - ;; (bar :url "somewhere")) - ;; :version "1" :else "") - (if (keywordp (cadr data)) (car data) data))))) +(defun helm-packages-fetch-recipe (url) + (with-temp-buffer + (url-insert-file-contents url) + (goto-char (point-min)) + (let ((data (read (current-buffer)))) + ;; Recipes do not have the same form depending from + ;; where we fetch them, they may be like + ;; ((foo :url "somewhere") + ;; (bar :url "somewhere")) + ;; or + ;; (((foo :url "somewhere") + ;; (bar :url "somewhere")) + ;; :version "1" :else "") + (if (keywordp (cadr data)) (car data) data)))) (defun helm-packages-get-package-url (package provider) "Get PACKAGE url from PROVIDER's recipe. Returns a plist like (:url <url> :branch <branch>). PROVIDER can be one of \"melpa\", \"gnu\" or \"nongnu\"." - (let* ((cache (helm-acase provider + (let* ((address (assoc-default provider helm-packages-recipes-alist)) + (cache (helm-acase provider ("gnu" 'helm-packages--gnu-elpa-recipes-cache) ("nongnu" 'helm-packages--nongnu-elpa-recipes-cache) ("melpa" 'helm-packages--melpa-recipes-cache))) (recipe (or (symbol-value cache) - (set cache (helm-packages-fetch-recipe provider)))) + (set cache (helm-packages-fetch-recipe address)))) (package-recipe (assq package recipe)) (core (plist-get (cdr package-recipe) :core)) (url (or (plist-get (cdr package-recipe) :url)