Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
a2cd6d90
Commit
a2cd6d90
authored
Jan 14, 2015
by
Artur Malabarba
Browse files
emacs-lisp/package.el and package-x.el: References to package-desc-kind
parent
40d963ff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
0 deletions
+13
-0
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/emacs-lisp/package-x.el
lisp/emacs-lisp/package-x.el
+4
-0
lisp/emacs-lisp/package.el
lisp/emacs-lisp/package.el
+4
-0
No files found.
lisp/ChangeLog
View file @
a2cd6d90
...
...
@@ -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.
(package-desc-suffix)
(package-install-from-archive)
* emacs-lisp/package-x.el (package-upload-buffer-internal): Ensure
all remaining instances of `package-desc-kind' handle the 'dir
value.
2015-01-16 Jorgen Schaefer <contact@jorgenschaefer.de>
...
...
lisp/emacs-lisp/package-x.el
View file @
a2cd6d90
...
...
@@ -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
)
...
...
lisp/emacs-lisp/package.el
View file @
a2cd6d90
...
...
@@ -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
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment