diff options
| author | Alex Dunn | 2015-10-27 18:27:57 -0700 |
|---|---|---|
| committer | Alex Dunn | 2015-10-28 19:43:17 -0700 |
| commit | dd71d34bab1d52b0005a9dd837796aeb959627af (patch) | |
| tree | 4b2f9268993ad6cf3913dde634acf3432116393f /Library | |
| parent | 4db8ef00bfbd792c42ae6cdca1ec42b5008654a7 (diff) | |
| download | brew-dd71d34bab1d52b0005a9dd837796aeb959627af.tar.bz2 | |
emacs_requirement: allow no version
see Homebrew/homebrew-emacs#29
Closes Homebrew/homebrew#45426.
Signed-off-by: Alex Dunn <dunn.alex@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/requirements/emacs_requirement.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Library/Homebrew/requirements/emacs_requirement.rb b/Library/Homebrew/requirements/emacs_requirement.rb index 1da3ecd04..811810f07 100644 --- a/Library/Homebrew/requirements/emacs_requirement.rb +++ b/Library/Homebrew/requirements/emacs_requirement.rb @@ -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 |
