procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

emacs-lisp/package.el (package--read-pkg-desc): Fix tar-desc reference.

Browse source
This commit is contained in:
Artur Malabarba 2015-02-03 18:14:28 -02:00
parent 2a4a5069a6
commit 200a47d45c
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -25,6 +25,9 @@
(package-autoremove): Use it.
(package-menu-execute): Offer to remove unneeded packages.
(package--read-pkg-desc, package-tar-file-info): Fix reference to
tar-desc.
2015-02-03 Thierry Volpiatto <thierry.volpiatto@gmail.com>
* emacs-lisp/package.el (package-reinstall): Don't change package's selected status.

13
lisp/emacs-lisp/package.el
View file

@ -1345,7 +1345,9 @@ The return result is a `package-desc'."
(error "No package descriptor file found"))
(with-current-buffer (tar--extract tar-desc)
(unwind-protect
(package--read-pkg-desc 'tar)
(or (package--read-pkg-desc 'tar)
(error "Can't find define-package in %s"
(tar-header-name tar-desc)))
(kill-buffer (current-buffer))))))
(defun package-dir-info ()
@ -1378,13 +1380,12 @@ Return the pkg-desc, with desc-kind set to KIND."
(unwind-protect
(let* ((pkg-def-parsed (read (current-buffer)))
(pkg-desc
(if (not (eq (car pkg-def-parsed) 'define-package))
(error "Can't find define-package in %s"
(tar-header-name tar-desc))
(when (eq (car pkg-def-parsed) 'define-package)
(apply #'package-desc-from-define
(append (cdr pkg-def-parsed))))))
(setf (package-desc-kind pkg-desc) kind)
pkg-desc)))
(when pkg-desc
(setf (package-desc-kind pkg-desc) kind)
pkg-desc))))
;;;###autoload