[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 200a47d 2/2: emacs-lisp/package.el (package--read-p
From: |
Artur Malabarba |
Subject: |
[Emacs-diffs] master 200a47d 2/2: emacs-lisp/package.el (package--read-pkg-desc): Fix tar-desc reference. |
Date: |
Tue, 03 Feb 2015 20:17:24 +0000 |
branch: master
commit 200a47d45cf8550e5995dd23025acaf3edf81b4a
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
emacs-lisp/package.el (package--read-pkg-desc): Fix tar-desc reference.
---
lisp/ChangeLog | 3 +++
lisp/emacs-lisp/package.el | 13 +++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 38d41b27..c18a8ff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 <address@hidden>
* emacs-lisp/package.el (package-reinstall): Don't change package's
selected status.
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d013fd4..fa620eb 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -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