aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/software_spec.rb
diff options
context:
space:
mode:
authorJack Nagel2013-09-17 21:25:40 -0500
committerJack Nagel2013-09-17 21:29:53 -0500
commite068606c9849b4f8af8e9e194c8ea51c797d4180 (patch)
treeebae058c62d0839e41d4b826cb1baebb39da806b /Library/Homebrew/software_spec.rb
parent599abc564f2706133eb2d12a85807742be4519a5 (diff)
downloadhomebrew-e068606c9849b4f8af8e9e194c8ea51c797d4180.tar.bz2
Make spec-scoped resources override top-level resources
Diffstat (limited to 'Library/Homebrew/software_spec.rb')
-rw-r--r--Library/Homebrew/software_spec.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index eedbf47b4..7b4004ecb 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -23,9 +23,13 @@ class SoftwareSpec
resources.each_value { |r| r.owner = owner }
end
+ def resource? name
+ resources.has_key?(name)
+ end
+
def resource name, &block
if block_given?
- raise DuplicateResourceError.new(name) if resources.has_key?(name)
+ raise DuplicateResourceError.new(name) if resource?(name)
resources[name] = Resource.new(name, &block)
else
resources.fetch(name) { raise ResourceMissingError.new(owner, name) }