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

audit: move audit_java_home inside audit_line

Browse Source
This commit is contained in:
Xu Cheng 2015-05-24 16:27:54 +08:00
parent cc0c9cf619
commit e4ff0a2f2e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/cmd/audit.rb
View File

@ -206,12 +206,6 @@ class FormulaAuditor
end end
end end
def audit_java_home
if text =~ /JAVA_HOME/i && !formula.requirements.map(&:class).include?(JavaDependency)
problem "Use `depends_on :java` to set JAVA_HOME"
end
end
def audit_conflicts def audit_conflicts
formula.conflicts.each do |c| formula.conflicts.each do |c|
begin begin
@ -601,6 +595,10 @@ class FormulaAuditor
problem "Use `depends_on :fortran` instead of `ENV.fortran`" problem "Use `depends_on :fortran` instead of `ENV.fortran`"
end end
if line =~ /JAVA_HOME/i && !formula.requirements.map(&:class).include?(JavaDependency)
problem "Use `depends_on :java` to set JAVA_HOME"
end
if line =~ /depends_on :(.+) (if.+|unless.+)$/ if line =~ /depends_on :(.+) (if.+|unless.+)$/
audit_conditional_dep($1.to_sym, $2, $&) audit_conditional_dep($1.to_sym, $2, $&)
end end
@ -686,7 +684,6 @@ class FormulaAuditor
audit_specs audit_specs
audit_homepage audit_homepage
audit_deps audit_deps
audit_java_home
audit_conflicts audit_conflicts
audit_options audit_options
audit_patches audit_patches