summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/package-x.el
diff options
context:
space:
mode:
authorArtur Malabarba <bruce.connor.am@gmail.com>2015-01-14 12:57:32 -0200
committerArtur Malabarba <bruce.connor.am@gmail.com>2015-01-16 22:21:12 -0200
commita2cd6d90d20408a6265c8615697dbff94df3f098 (patch)
treec01bb226604e86dc38e7320334d3f031ee225468 /lisp/emacs-lisp/package-x.el
parent40d963ff660eb256652cdca98094bfbda23daa9a (diff)
downloademacs-a2cd6d90d20408a6265c8615697dbff94df3f098.tar.gz
emacs-lisp/package.el and package-x.el: References to package-desc-kind
Diffstat (limited to 'lisp/emacs-lisp/package-x.el')
-rw-r--r--lisp/emacs-lisp/package-x.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el
index f2bcdad1720..e0945d47a45 100644
--- a/lisp/emacs-lisp/package-x.el
+++ b/lisp/emacs-lisp/package-x.el
@@ -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)