aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/requirement.rb
diff options
context:
space:
mode:
authorJack Nagel2013-12-09 14:36:10 -0600
committerJack Nagel2013-12-09 14:36:10 -0600
commit08055e1776c166d26bdce0995ee16cfabec392f0 (patch)
treedae99dc2463cf899f2eb8d05df217b1be64b9d77 /Library/Homebrew/requirement.rb
parent901902b53b7b47ed9e941f585738e17b034c98c2 (diff)
downloadbrew-08055e1776c166d26bdce0995ee16cfabec392f0.tar.bz2
Ensure option names are consistent for default formula requirements
Diffstat (limited to 'Library/Homebrew/requirement.rb')
-rw-r--r--Library/Homebrew/requirement.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb
index 58b8e57e4..9062d2d13 100644
--- a/Library/Homebrew/requirement.rb
+++ b/Library/Homebrew/requirement.rb
@@ -10,12 +10,13 @@ class Requirement
include Dependable
extend BuildEnvironmentDSL
- attr_reader :tags, :name
+ attr_reader :tags, :name, :option_name
def initialize(tags=[])
@tags = tags
@tags << :build if self.class.build
@name ||= infer_name
+ @option_name = @name
end
# The message to show when the requirement is not met.
@@ -70,6 +71,7 @@ class Requirement
f = self.class.default_formula
raise "No default formula defined for #{inspect}" if f.nil?
dep = Dependency.new(f, tags)
+ dep.option_name = name
dep.env_proc = method(:modify_build_environment)
dep
end
@@ -174,7 +176,7 @@ class Requirement
if block_given?
yield dependent, req
elsif req.optional? || req.recommended?
- prune unless dependent.build.with?(req.name)
+ prune unless dependent.build.with?(req)
end
end
end