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

Add non string variant of get package version functions

This commit is contained in:
syl20bnr 2015-02-08 23:03:52 -05:00
parent 71d96a06f3
commit 5f5c510019
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/core-configuration-layer.el
View File

@ -410,8 +410,8 @@ If PRE is non nil then `layer-pre-extensions' is read instead of
(mapcar 'car deps)))))
(when update-deps
(setq result (append update-deps result))))
(let ((installed-version (configuration-layer//get-package-version pkg))
(newest-version (configuration-layer//get-latest-package-version
(let ((installed-version (configuration-layer//get-package-version-string pkg))
(newest-version (configuration-layer//get-latest-package-version-string
pkg)))
;; (message "package - %s" pkg)
;; (message "installed - %s" installed-version)
@ -684,30 +684,42 @@ deleted safely."
(when reqs2 (setq reqs (append reqs2 reqs)))))
reqs))
(defun configuration-layer//get-package-version (pkg)
(defun configuration-layer//get-package-version-string (pkg)
"Return the version string for PKG."
(let ((pkg-desc (assq pkg package-alist)))
(when pkg-desc
(cond
((version< emacs-version "24.3.50")
(package-version-join (aref (cdr pkg-desc) 0)))
((version< emacs-version "24.3.50") (package-version-join
(aref (cdr pkg-desc) 0)))
(t (package-version-join (package-desc-version (cadr pkg-desc))))))))
(defun configuration-layer//get-latest-package-version (pkg)
(defun configuration-layer//get-package-version (pkg)
"Return the version list for PKG."
(let ((version-string (configuration-layer//get-package-version-string pkg)))
(unless (string-empty-p version-string)
(version-to-list version-string))))
(defun configuration-layer//get-latest-package-version-string (pkg)
"Return the version string for PKG."
(let ((pkg-arch (assq pkg package-archive-contents)))
(when pkg-arch
(cond
((version< emacs-version "24.3.50")
(package-version-join (aref (cdr pkg-arch) 0)))
((version< emacs-version "24.3.50") (package-version-join
(aref (cdr pkg-arch) 0)))
(t (package-version-join (package-desc-version (cadr pkg-arch))))))))
(defun configuration-layer//get-latest-package-version (pkg)
"Return the versio list for PKG."
(let ((version-string (configuration-layer//get-latest-package-version-string pkg)))
(unless (string-empty-p version-string)
(version-to-list version-string))))
(defun configuration-layer//package-delete (pkg)
"Delete the passed PKG."
(cond
((version< emacs-version "24.3.50")
(package-delete (symbol-name pkg)
(configuration-layer//get-package-version pkg)))
(configuration-layer//get-package-version-string pkg)))
(t (package-delete (cadr (assq pkg package-alist))))))
(defun configuration-layer/delete-orphan-packages ()