diff options
| author | Mike McQuaid | 2012-04-19 15:21:39 -0500 |
|---|---|---|
| committer | Mike McQuaid | 2012-04-24 18:08:14 +1000 |
| commit | dcad1ae49fa9fb90515bfd35d2cedc6586b9b5bf (patch) | |
| tree | 1e0ac05b30893007b2e03d2f1684d9beb09ae4c6 /Library/Homebrew | |
| parent | 40370e05bdd00b2ee5526a78e39eed7e61ae00ae (diff) | |
| download | brew-dcad1ae49fa9fb90515bfd35d2cedc6586b9b5bf.tar.bz2 | |
Add and correctly find erlang bottle.
Diffstat (limited to 'Library/Homebrew')
| -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 0cd1f7bf2..2b796aabf 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 d705bc2f9..caf081f60 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 |