aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2012-04-24 18:10:09 +1000
committerMike McQuaid2012-04-24 18:10:09 +1000
commit2919ffb8e2ad29c1fbf823e634fc4f2fd9093e33 (patch)
treec624af861558c502e994d299f542cbf19911fce3 /Library
parentd60023c466e3c782a69550aaf7ca7d35a1d24fe2 (diff)
downloadhomebrew-2919ffb8e2ad29c1fbf823e634fc4f2fd9093e33.tar.bz2
Revert "Add and correctly find erlang bottle."
This reverts commit 146e253856eb3e27b6b7382734fd178c160c1beb.
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/erlang.rb2
-rw-r--r--Library/Homebrew/bottles.rb2
-rw-r--r--Library/Homebrew/extend/pathname.rb6
3 files changed, 5 insertions, 5 deletions
diff --git a/Library/Formula/erlang.rb b/Library/Formula/erlang.rb
index 2af335dd1..083d9a776 100644
--- a/Library/Formula/erlang.rb
+++ b/Library/Formula/erlang.rb
@@ -30,7 +30,7 @@ class Erlang < Formula
bottle do
# Lion bottle built on OS X 10.7.2 using Xcode 4.1 using:
# brew install erlang --build-bottle --use-gcc
- sha1 '4dfc11ed455f8f866ab4627e8055488fa1954fa4' => :lion
+ # sha1 '4c81febc679dc9e9c27e66317fc317df9a5a40e7'
sha1 '8a4adc813ca906c8e685ff571de03653f316146c' => :snowleopard
end
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