github/melpa
1
0
Fork 0
mirror of https://github.com/correl/melpa.git synced 2024-12-22 19:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure we use vectors for parsed package info, even in Emacs HEAD

Browse source 
`package-buffer-info` in Emacs HEAD now returns CL structs, which
subtly breaks package-build, since they still kinda look like vectors.

This commit introduces a wrapper for `package-buffer-info` so that we
get the same sort of data back in any Emacs version.
This commit is contained in:
Steve Purcell 2013-07-22 10:10:28 +01:00
parent 113118947e
commit 42f3015298
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
package-build.el
View file

@ -541,7 +541,7 @@ The file is written to `package-build-working-dir'."
(pb/update-or-insert-version "0")
(pb/ensure-ends-here-line file-path)
(cl-flet ((package-strip-rcs-id (str) "0"))
(package-buffer-info))))))
(pb/package-buffer-info-vec))))))
(defun pb/get-pkg-file-info (file-path)
"Get a vector of package info from \"-pkg.el\" file FILE-PATH."
@ -755,6 +755,17 @@ FILES is a list of (SOURCE . DEST) relative filepath pairs."
"Return the filename of the most recently built package of NAME."
(pb/archive-file-name (assoc name (package-build-archive-alist))))
(defun pb/package-buffer-info-vec ()
"Return a vector of package info.
`package-buffer-info' returns a vector in older Emacs versions,
and a cl struct in Emacs HEAD. This wrapper normalises the results."
(let ((desc (package-buffer-info)))
(if (fboundp 'package-desc-create)
(vector (package-desc-name desc)
(package-desc-reqs desc)
(package-desc-summary desc)
(package-desc-version desc))
desc)))
;;; Public interface
;;;###autoload
@ -802,7 +813,7 @@ FILES is a list of (SOURCE . DEST) relative filepath pairs."
(pb/ensure-ends-here-line pkg-source)
(write-file pkg-target nil)
(condition-case err
(package-buffer-info)
(pb/package-buffer-info-vec)
(error
(message "Warning: %S" err)))
(kill-buffer)))