diff options
| author | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-02-03 18:14:28 -0200 |
|---|---|---|
| committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-02-03 18:14:28 -0200 |
| commit | 200a47d45cf8550e5995dd23025acaf3edf81b4a (patch) | |
| tree | daa152ae3c90be21c371bdb96ce1a0deec248f29 /lisp/emacs-lisp | |
| parent | 2a4a5069a6a0dba8888d72e60b66a3df5ed5a8cb (diff) | |
| download | emacs-200a47d45cf8550e5995dd23025acaf3edf81b4a.tar.gz emacs-200a47d45cf8550e5995dd23025acaf3edf81b4a.tar.bz2 emacs-200a47d45cf8550e5995dd23025acaf3edf81b4a.zip | |
emacs-lisp/package.el (package--read-pkg-desc): Fix tar-desc reference.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index d013fd4a329..fa620eb6bb6 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 |