diff options
| author | Mike McQuaid | 2012-04-24 18:10:09 +1000 |
|---|---|---|
| committer | Mike McQuaid | 2012-04-24 18:10:09 +1000 |
| commit | d69620a55e0d866f84f2a692af8a8a1689e4b160 (patch) | |
| tree | d35633ea0fa85e8e7f2e4dce862175dd1ca3c538 | |
| parent | 4138d30428be9028cd223313631587187fc7d276 (diff) | |
| download | brew-d69620a55e0d866f84f2a692af8a8a1689e4b160.tar.bz2 | |
Revert "Add and correctly find erlang bottle."
This reverts commit 146e253856eb3e27b6b7382734fd178c160c1beb.
| -rw-r--r-- | Library/Homebrew/bottles.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/extend/pathname.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb index 739f601c5..b3f9fbe2b 100644 --- a/Library/Homebrew/bottles.rb +++ b/Library/Homebrew/bottles.rb @@ -23,6 +23,8 @@ 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 82202ce5a..454afb074 100644 --- a/Library/Homebrew/extend/pathname.rb +++ b/Library/Homebrew/extend/pathname.rb @@ -214,10 +214,8 @@ class Pathname return $1 if $1 # eg. foobar4.5.1 - unless /^erlang-/.match basename - /((\d+\.)*\d+)$/.match stem - return $1 if $1 - end + /((\d+\.)*\d+)$/.match stem + return $1 if $1 # eg foobar-4.5.0-bin /-((\d+\.)+\d+[abc]?)[-._](bin|dist|stable|src|sources?)$/.match stem |