handle mxcl/master synonym inside Tab#from_file_content

3 files changed, 7 insertions, 3 deletions

diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index 2c20b2585..fda54d591 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -48,7 +48,7 @@ def bottle_resolve_formula_names bottle_file
   name = receipt_file_path.split("/").first
   tap = Tab.from_file_content(receipt_file, "#{bottle_file}/#{receipt_file_path}").tap
 
-  if tap.nil? || tap == "Homebrew/homebrew" || tap == "mxcl/master"
+  if tap.nil? || tap == "Homebrew/homebrew"
     full_name = name
   else
     full_name = "#{tap.sub("homebrew-", "")}/#{name}"
@@ -67,7 +67,7 @@ class Bintray
   end
 
   def self.repository(tap=nil)
-    return "bottles" if tap.nil? || tap == "Homebrew/homebrew" || tap == "mxcl/master"
+    return "bottles" if tap.nil? || tap == "Homebrew/homebrew"
     "bottles-#{tap.sub(/^homebrew\/(homebrew-)?/i, "")}"
   end
 end
diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index 483ea934f..145badc5f 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -186,7 +186,7 @@ class Formulary
     tap = tab.tap
     spec ||= tab.spec
 
-    if tap.nil? || tap == "Homebrew/homebrew" || tap == "mxcl/master"
+    if tap.nil? || tap == "Homebrew/homebrew"
       factory(rack.basename.to_s, spec)
     else
       factory("#{tap.sub("homebrew-", "")}/#{rack.basename}", spec)
diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb
index 4fad2411d..a65499dad 100644
--- a/Library/Homebrew/tab.rb
+++ b/Library/Homebrew/tab.rb
@@ -43,6 +43,10 @@ class Tab < OpenStruct
     tapped_from = attributes["tapped_from"]
     unless tapped_from.nil? || tapped_from == "path or URL"
       attributes["source"]["tap"] = attributes.delete("tapped_from")
+
+      if attributes["source"]["tap"] == "mxcl/master"
+        attributes["source"]["tap"] == "Homebrew/homebrew"
+      end
     end
 
     if attributes["source"]["spec"].nil?