diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb index 0cd1f7bf23..2b796aabff 100644 --- a/Library/Homebrew/bottles.rb +++ b/Library/Homebrew/bottles.rb @@ -22,8 +22,6 @@ def built_bottle? f end def bottle_current? f - puts Pathname.new(f.bottle_url).version - puts f.version f.bottle_url && f.bottle_sha1 && Pathname.new(f.bottle_url).version == f.version end diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb index d705bc2f95..caf081f607 100644 --- a/Library/Homebrew/extend/pathname.rb +++ b/Library/Homebrew/extend/pathname.rb @@ -213,8 +213,10 @@ class Pathname return $1 if $1 # eg. foobar4.5.1 - /((\d+\.)*\d+)$/.match stem - return $1 if $1 + unless /^erlang-/.match basename + /((\d+\.)*\d+)$/.match stem + return $1 if $1 + end # eg foobar-4.5.0-bin /-((\d+\.)+\d+[abc]?)[-._](bin|dist|stable|src|sources?)$/.match stem