diff options
| author | Xu Cheng | 2015-10-07 17:34:29 +0800 | 
|---|---|---|
| committer | Xu Cheng | 2015-10-08 16:02:33 +0800 | 
| commit | ee332c4550193893fb6cd660e01443e292c5ff0b (patch) | |
| tree | 1577362646354e2f170927b71f0453c7e56f546c /Library/Homebrew/cmd/audit.rb | |
| parent | fde5b48d837d3161f5f6019269f082efda9b49ec (diff) | |
| download | brew-ee332c4550193893fb6cd660e01443e292c5ff0b.tar.bz2 | |
handle TapFormulaWithOldnameAmbiguityError
Closes Homebrew/homebrew#44705.
Signed-off-by: Xu Cheng <xucheng@me.com>
Diffstat (limited to 'Library/Homebrew/cmd/audit.rb')
| -rw-r--r-- | Library/Homebrew/cmd/audit.rb | 7 | 
1 files changed, 5 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb index 95acd9430..ed8e7bf15 100644 --- a/Library/Homebrew/cmd/audit.rb +++ b/Library/Homebrew/cmd/audit.rb @@ -282,9 +282,12 @@ class FormulaAuditor          rescue TapFormulaAmbiguityError            problem "Ambiguous dependency #{dep.name.inspect}."            next +        rescue TapFormulaWithOldnameAmbiguityError +          problem "Ambiguous oldname dependency #{dep.name.inspect}." +          next          end -        if FORMULA_RENAMES[dep.name] == dep_f.name +        if dep_f.oldname && dep.name.split("/").last == dep_f.oldname            problem "Dependency '#{dep.name}' was renamed; use newname '#{dep_f.name}'."          end @@ -343,7 +346,7 @@ class FormulaAuditor          next        rescue FormulaUnavailableError          problem "Can't find conflicting formula #{c.name.inspect}." -      rescue TapFormulaAmbiguityError +      rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError          problem "Ambiguous conflicting formula #{c.name.inspect}."        end      end  | 
