admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

emacs_requirement: allow no version

Browse Source 
see Homebrew/homebrew-emacs#29

Closes Homebrew/homebrew#45426.

Signed-off-by: Alex Dunn <dunn.alex@gmail.com>
This commit is contained in:
Alex Dunn 2015-10-27 18:27:57 -07:00
parent 4db8ef00bf
commit dd71d34bab
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/requirements/emacs_requirement.rb
View File

@ -4,12 +4,12 @@ class EmacsRequirement < Requirement
def initialize(tags) def initialize(tags)
@version = tags.shift if /\d+\.*\d*/ === tags.first @version = tags.shift if /\d+\.*\d*/ === tags.first
raise "Specify a version for EmacsRequirement" unless @version
super super
end end
satisfy :build_env => false do 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)") emacs_version = Utils.popen_read("emacs", "--batch", "--eval", "(princ emacs-version)")
Version.new(emacs_version) >= Version.new(@version) Version.new(emacs_version) >= Version.new(@version)
end end
@ -19,7 +19,11 @@ class EmacsRequirement < Requirement
end end
def message 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 += super
s s
end end