aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorMike McQuaid2012-04-24 18:10:09 +1000
committerMike McQuaid2012-04-24 18:10:09 +1000
commitd69620a55e0d866f84f2a692af8a8a1689e4b160 (patch)
treed35633ea0fa85e8e7f2e4dce862175dd1ca3c538 /Library/Homebrew
parent4138d30428be9028cd223313631587187fc7d276 (diff)
downloadbrew-d69620a55e0d866f84f2a692af8a8a1689e4b160.tar.bz2
Revert "Add and correctly find erlang bottle."
This reverts commit 146e253856eb3e27b6b7382734fd178c160c1beb.
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/bottles.rb2
-rw-r--r--Library/Homebrew/extend/pathname.rb6
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