From 1a72c85a05f9e2122be8bc6d0ddbb6d0381adefe Mon Sep 17 00:00:00 2001
From: Adam Vandenberg <flangy@gmail.com>
Date: Sun, 23 Jun 2013 16:21:48 -0700
Subject: [PATCH] Use 'path or URL' as tap for non-tap, non-core formulae
---
Library/Homebrew/exceptions.rb | 2 +-
Library/Homebrew/formula.rb | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb
index 612e4b7053..ede1b35abd 100644
--- a/Library/Homebrew/exceptions.rb
+++ b/Library/Homebrew/exceptions.rb
@@ -176,7 +176,7 @@ class BuildError < Homebrew::InstallationError
unless formula.core_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}"
end
ohai "Configuration"
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 2833951243..cec9857f7a 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -489,9 +489,10 @@ class Formula
def tap
if path.realpath.to_s =~ %r{#{HOMEBREW_REPOSITORY}/Library/Taps/(\w+)-(\w+)}
"#$1/#$2"
- else
- # remotely installed formula are not mxcl/master but this will do for now
+ elsif core_formula?
"mxcl/master"
+ else
+ "path or URL"
end
end
--
GitLab