emacs_requirement: allow no version
see Homebrew/homebrew-emacs#29 Closes Homebrew/homebrew#45426. Signed-off-by: Alex Dunn <dunn.alex@gmail.com>
This commit is contained in:
parent
4db8ef00bf
commit
dd71d34bab
@ -4,12 +4,12 @@ class EmacsRequirement < Requirement
|
||||
|
||||
def initialize(tags)
|
||||
@version = tags.shift if /\d+\.*\d*/ === tags.first
|
||||
raise "Specify a version for EmacsRequirement" unless @version
|
||||
super
|
||||
end
|
||||
|
||||
satisfy :build_env => false do
|
||||
next unless which "emacs"
|
||||
next false unless which "emacs"
|
||||
next true unless @version
|
||||
emacs_version = Utils.popen_read("emacs", "--batch", "--eval", "(princ emacs-version)")
|
||||
Version.new(emacs_version) >= Version.new(@version)
|
||||
end
|
||||
@ -19,7 +19,11 @@ class EmacsRequirement < Requirement
|
||||
end
|
||||
|
||||
def message
|
||||
s = "Emacs #{@version} or later is required."
|
||||
if @version
|
||||
s = "Emacs #{@version} or later is required."
|
||||
else
|
||||
s = "Emacs is required."
|
||||
end
|
||||
s += super
|
||||
s
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user