Permalink
Browse files

Correct the format of recipe when check for update

  • Loading branch information...
1 parent e6357a5 commit 3b6c0e3b31e78f11563dec3eae3369e5c2326899 @ynilu ynilu committed with d12frosted Oct 1, 2016
Showing with 4 additions and 4 deletions.
  1. +3 −3 core/core-configuration-layer.el
  2. +1 −1 tests/core/core-configuration-layer-utest.el
@@ -1419,18 +1419,18 @@ wether the declared layer is an used one or not."
(when pkg
(let ((location (oref pkg :location)))
(when (and (listp location) (eq 'recipe (car location)))
- location)))))
+ (cons pkg-name (cdr location)))))))
(defun configuration-layer//new-version-available-p (pkg-name)
"Return non nil if there is a new version available for PKG-NAME."
(let ((recipe (configuration-layer//get-package-recipe pkg-name))
(cur-version (configuration-layer//get-package-version-string pkg-name))
+ (quelpa-upgrade-p t)
new-version)
(when cur-version
(setq new-version
(if recipe
- (quelpa-checkout recipe (expand-file-name (symbol-name pkg-name)
- quelpa-build-dir))
+ (or (quelpa-checkout recipe (expand-file-name (symbol-name pkg-name) quelpa-build-dir)) cur-version)
(configuration-layer//get-latest-package-version-string
pkg-name)))
;; (message "%s: %s > %s ?" pkg-name cur-version new-version)
@@ -1746,7 +1746,7 @@
'layer-no-recipe-1)
,(configuration-layer/make-package '(pkg2 :location elpa)
'layer-no-recipe-1)) t)
- (should (eq 'recipe
+ (should (eq 'pkg1
(car (configuration-layer//get-package-recipe 'pkg1))))))
(ert-deftest test-get-package-recipe--return-nil-if-package-has-no-recipe ()

0 comments on commit 3b6c0e3

Please sign in to comment.