aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/requirement.rb
diff options
context:
space:
mode:
authorMike McQuaid2015-12-14 19:47:19 +0000
committerMike McQuaid2015-12-15 08:37:16 +0000
commite5ba31fcdcc4150e5aa8ecf110cfa502dd62a802 (patch)
treef8075f55b40693a89eec8a5b6e0fe3409f8df64a /Library/Homebrew/requirement.rb
parent484c70d19ff17944e4926e7ad3f9bc0fad98797a (diff)
downloadbrew-e5ba31fcdcc4150e5aa8ecf110cfa502dd62a802.tar.bz2
Allow multiple option_names in dep/reqs.
This means that dependencies can be merged but still maintain all their option names. Closes Homebrew/homebrew#46916. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Homebrew/requirement.rb')
-rw-r--r--Library/Homebrew/requirement.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb
index 9422792ed..91eedd72d 100644
--- a/Library/Homebrew/requirement.rb
+++ b/Library/Homebrew/requirement.rb
@@ -10,7 +10,6 @@ class Requirement
include Dependable
attr_reader :tags, :name, :cask, :download, :default_formula
- alias_method :option_name, :name
def initialize(tags = [])
@default_formula = self.class.default_formula
@@ -26,6 +25,10 @@ class Requirement
@name ||= infer_name
end
+ def option_names
+ [name]
+ end
+
# The message to show when the requirement is not met.
def message
s = ""