From 99ba9faf09c7bbc1110de68b1f47bdff1b95191c Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Wed, 27 May 2015 22:49:18 +0800 Subject: [PATCH] BottleLoader: use bottle_resolve_formula_names --- Library/Homebrew/formulary.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index 65ab0b68f1..5e55543d09 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -69,17 +69,8 @@ class Formulary class BottleLoader < FormulaLoader def initialize bottle_name @bottle_filename = Pathname(bottle_name).realpath - name_without_version = bottle_filename_formula_name @bottle_filename - if name_without_version.empty? - if ARGV.homebrew_developer? - opoo "Add a new regex to bottle_version.rb to parse this filename." - end - name = bottle_name - else - name = name_without_version - end - - super name, Formulary.path(name) + name, full_name = bottle_resolve_formula_names @bottle_filename + super name, Formulary.path(full_name) end def get_formula(spec)