Commit a2cd6d90 authored by Artur Malabarba's avatar Artur Malabarba
Browse files

emacs-lisp/package.el and package-x.el: References to package-desc-kind

parent 40d963ff
......@@ -7,6 +7,11 @@
directory. The return result is a `package-desc'.
(package-install-from-buffer): Install packages from dired buffer.
(package-install-file): Install packages from directory.
* emacs-lisp/package-x.el (package-upload-buffer-internal): Ensure
all remaining instances of `package-desc-kind' handle the 'dir
2015-01-16 Jorgen Schaefer <>
......@@ -207,6 +207,10 @@ if it exists."
(pkg-version (package-version-join split-version))
(pkg-buffer (current-buffer)))
;; `package-upload-file' will error if given a directory,
;; but we check it here as well just in case.
(when (eq 'dir file-type)
(user-error "Can't upload directory, tar it instead"))
;; Get archive-contents from ARCHIVE-URL if it's non-nil, or
;; from `package-archive-upload-base' otherwise.
(let ((contents (or (package--archive-contents-from-url archive-url)
......@@ -413,6 +413,7 @@ Slots:
(pcase (package-desc-kind pkg-desc)
(`single ".el")
(`tar ".tar")
(`dir "")
(kind (error "Unknown package kind: %s" kind))))
(defun package-desc--keywords (pkg-desc)
......@@ -939,6 +940,9 @@ GnuPG keyring is located under \"gnupg\" in `package-user-dir'."
(defun package-install-from-archive (pkg-desc)
"Download and install a tar package."
;; This won't happen, unless the archive is doing something wrong.
(when (eq (package-desc-kind pkg-desc) 'dir)
(error "Can't install directory package from archive"))
(let* ((location (package-archive-base pkg-desc))
(file (concat (package-desc-full-name pkg-desc)
(package-desc-suffix pkg-desc)))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment