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

Formula: improve local bottle failure messaging.

Browse Source
This commit is contained in:
Mike McQuaid 2013-06-20 13:07:43 +01:00
parent d456d42813
commit a783946b6d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/formula.rb
View File

@ -406,7 +406,15 @@ class Formula
elsif name.match bottle_regex elsif name.match bottle_regex
bottle_filename = Pathname(name).realpath bottle_filename = Pathname(name).realpath
version = Version.parse(bottle_filename).to_s version = Version.parse(bottle_filename).to_s
name = bottle_filename.basename.to_s.rpartition("-#{version}").first bottle_basename = bottle_filename.basename.to_s
name_without_version = bottle_basename.rpartition("-#{version}").first
if name_without_version.empty?
if ARGV.homebrew_developer?
opoo "Add a new version regex to version.rb to parse this filename."
end
else
name = name_without_version
end
path = Formula.path(name) path = Formula.path(name)
install_type = :from_local_bottle install_type = :from_local_bottle
else else