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

Use 'path or URL' as tap for non-tap, non-core formulae

Browse Source
This commit is contained in:
Adam Vandenberg 2013-06-23 16:21:48 -07:00
parent b9b1dfb9a6
commit 1a72c85a05
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/exceptions.rb
View File

@ -176,7 +176,7 @@ class BuildError < Homebrew::InstallationError
unless formula.core_formula? unless formula.core_formula?
ohai "Formula" ohai "Formula"
puts "Tap: #{formula.tap}" unless formula.tap == "mxcl/master" # tap lies about non-tap externals puts "Tap: #{formula.tap}"
puts "Path: #{formula.path.realpath}" puts "Path: #{formula.path.realpath}"
end end
ohai "Configuration" ohai "Configuration"

5
Library/Homebrew/formula.rb
View File

@ -489,9 +489,10 @@ class Formula
def tap def tap
if path.realpath.to_s =~ %r{#{HOMEBREW_REPOSITORY}/Library/Taps/(\w+)-(\w+)} if path.realpath.to_s =~ %r{#{HOMEBREW_REPOSITORY}/Library/Taps/(\w+)-(\w+)}
"#$1/#$2" "#$1/#$2"
else elsif core_formula?
# remotely installed formula are not mxcl/master but this will do for now
"mxcl/master" "mxcl/master"
else
"path or URL"
end end
end end