From: Tom Willemse <tom@ryuslash.org>
To: 15108@debbugs.gnu.org
Subject: bug#15108: More flexible package dependency specification
Date: Fri, 16 Aug 2013 22:58:18 +0200 [thread overview]
Message-ID: <m3fvu9ic9h.fsf@ryuslash.org> (raw)
In-Reply-To: <m31u5uzdp0.fsf@ryuslash.org>
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
What would you think of the attached patch? It works for all the
examples I sent earlier. Any comments, criticisms and considerations
would be greatly appreciated.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: ChangeLog diff --]
[-- Type: text/x-diff, Size: 592 bytes --]
*** lisp/ChangeLog 2013-08-16 22:53:18.590328000 +0200
--- lisp/ChangeLog.new 2013-08-16 22:45:04.548991805 +0200
***************
*** 1,3 ****
--- 1,11 ----
+ 2013-08-16 Tom Willemse <tom@ryuslash.org>
+
+ * emacs-lisp/package.el (package--prepare-dependencies): New
+ function.
+ (package-buffer-info): Call `package--prepare-dependencies' on the
+ list contained in the package-requires header to make dependency
+ specification a little more flexible.
+
2013-08-16 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/shr.el (shr-rescale-image): Use ImageMagick even for GIFs
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: package.el diff --]
[-- Type: text/x-diff, Size: 1487 bytes --]
*** lisp/emacs-lisp/package.el 2013-08-16 22:53:18.590328000 +0200
--- lisp/emacs-lisp/package.el.new 2013-08-16 22:52:51.479137603 +0200
***************
*** 973,978 ****
--- 973,989 ----
str)
(error nil))))
+ (defun package--prepare-dependencies (deps)
+ "Turn DEPS into an acceptable list of dependencies.
+
+ Any parts missing a version string get a default version string
+ of \"0\" (meaning any version) and an appropriate level of lists
+ is wrapped around any parts requiring it."
+ (cond
+ ((symbolp deps) `((,deps "0")))
+ ((stringp (cadr deps)) `(,deps))
+ (t (mapcar (lambda (dep) (if (symbolp dep) `(,dep "0") dep)) deps))))
+
(defun package-buffer-info ()
"Return a `package-desc' describing the package in the current buffer.
***************
*** 1003,1009 ****
"Package lacks a \"Version\" or \"Package-Version\" header"))
(package-desc-from-define
file-name pkg-version desc
! (if requires-str (package-read-from-string requires-str))
:kind 'single))))
(declare-function tar-get-file-descriptor "tar-mode" (file))
--- 1014,1022 ----
"Package lacks a \"Version\" or \"Package-Version\" header"))
(package-desc-from-define
file-name pkg-version desc
! (if requires-str
! (package--prepare-dependencies
! (package-read-from-string requires-str)))
:kind 'single))))
(declare-function tar-get-file-descriptor "tar-mode" (file))
next prev parent reply other threads:[~2013-08-16 20:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-16 0:23 bug#15108: 24.3.50; Package dependency documentation Tom Willemse
2013-08-16 3:46 ` Stefan Monnier
2013-08-16 6:57 ` Drew Adams
2013-08-16 7:35 ` Tom Willemse
2013-08-16 7:46 ` Drew Adams
2013-08-16 8:06 ` Tom Willemse
2013-08-16 20:58 ` Tom Willemse [this message]
2013-12-11 20:29 ` bug#15108: [Patch] Updated package dependencies Tom Willemse
2013-12-11 20:52 ` Drew Adams
2013-12-11 21:24 ` bug#15108: " Tom Willemse
2013-12-11 21:57 ` Drew Adams
2013-12-11 22:52 ` bug#15108: [Patch] Updated package dependencies, again Tom Willemse
2013-12-12 18:30 ` bug#15108: [Patch] Updated package dependencies Stefan Monnier
2013-12-12 19:23 ` Tom Willemse
2013-12-15 1:08 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3fvu9ic9h.fsf@ryuslash.org \
--to=tom@ryuslash.org \
--cc=15108@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.