[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115918: package.el: various fixes.
From: |
Bastien Guerry |
Subject: |
[Emacs-diffs] trunk r115918: package.el: various fixes. |
Date: |
Wed, 08 Jan 2014 11:20:16 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115918
revision-id: address@hidden
parent: address@hidden
committer: Bastien Guerry <address@hidden>
branch nick: trunk
timestamp: Wed 2014-01-08 12:19:30 +0100
message:
package.el: various fixes.
* emacs-lisp/package.el (package-installed-p): First check if the
package name is in package-alist.
(package-delete): Correctly delete the package from package-alist.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/emacs-lisp/package.el package.el-20100617020707-ybavz666awsxwin6-2
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-01-08 06:25:21 +0000
+++ b/lisp/ChangeLog 2014-01-08 11:19:30 +0000
@@ -1,3 +1,9 @@
+2014-01-08 Bastien Guerry <address@hidden>
+
+ * emacs-lisp/package.el (package-installed-p): First check if the
+ package name is in package-alist.
+ (package-delete): Correctly delete the package from package-alist.
+
2014-01-08 Daiki Ueno <address@hidden>
* emacs-lisp/package.el (url-recreate-url): Declare.
=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el 2014-01-08 06:25:21 +0000
+++ b/lisp/emacs-lisp/package.el 2014-01-08 11:19:30 +0000
@@ -881,13 +881,14 @@
"Return true if PACKAGE, of MIN-VERSION or newer, is installed.
MIN-VERSION should be a version list."
(unless package--initialized (error "package.el is not yet initialized!"))
+ (when (assq package package-alist)
(or
(let ((pkg-descs (cdr (assq package package-alist))))
(and pkg-descs
(version-list-<= min-version
(package-desc-version (car pkg-descs)))))
;; Also check built-in packages.
- (package-built-in-p package min-version)))
+ (package-built-in-p package min-version))))
(defun package-compute-transaction (packages requirements)
"Return a list of packages to be installed, including PACKAGES.
@@ -1232,7 +1233,7 @@
(delete-file signed-file)))
;; Update package-alist.
(let* ((name (package-desc-name pkg-desc)))
- (delete (delete pkg-desc (assq name package-alist)) package-alist))
+ (setq package-alist (delete (assq name package-alist) package-alist)))
(message "Package `%s' deleted." (package-desc-full-name pkg-desc)))))
(defun package-archive-base (desc)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115918: package.el: various fixes.,
Bastien Guerry <=