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

FormulaValidationError: include full_name

Browse Source 
Closes Homebrew/homebrew#44946.

Signed-off-by: Baptiste Fontaine <batifon@yahoo.fr>
This commit is contained in:
Baptiste Fontaine 2015-10-14 14:42:34 +02:00
parent 4cf703d5d8
commit f3035333fb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/exceptions.rb
View File

@ -23,11 +23,12 @@ class NoSuchKegError < RuntimeError
end
class FormulaValidationError < StandardError
attr_reader :attr
attr_reader :attr, :formula
def initialize(attr, value)
def initialize(formula, attr, value)
@attr = attr
super "invalid attribute: #{attr} (#{value.inspect})"
@formula = formula
super "invalid attribute for formula '#{formula}': #{attr} (#{value.inspect})"
end
end

6
Library/Homebrew/formula.rb
View File

@ -182,17 +182,17 @@ class Formula
def validate_attributes!
if name.nil? || name.empty? || name =~ /\s/
raise FormulaValidationError.new(:name, name)
raise FormulaValidationError.new(full_name, :name, name)
end
url = active_spec.url
if url.nil? || url.empty? || url =~ /\s/
raise FormulaValidationError.new(:url, url)
raise FormulaValidationError.new(full_name, :url, url)
end
val = version.respond_to?(:to_str) ? version.to_str : version
if val.nil? || val.empty? || val =~ /\s/
raise FormulaValidationError.new(:version, val)
raise FormulaValidationError.new(full_name, :version, val)
end
end