admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Fix bottles on non-Lion.

Browse Source
This commit is contained in:
Mike McQuaid 2012-03-18 20:47:57 +13:00
parent 64457b2315
commit 85452c5e91
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/bottles.rb
View File

@ -10,14 +10,7 @@ def bottles_supported?
end end
def install_bottle? f def install_bottle? f
!ARGV.build_from_source? && bottle_current?(f) && bottle_native?(f) !ARGV.build_from_source? && bottle_current?(f)
end
def bottle_native? f
return true if bottle_native_regex.match(f.bottle_url)
# old brew bottle style
return true if MacOS.lion? && old_bottle_regex.match(f.bottle_url)
return false
end end
def built_bottle? f def built_bottle? f
@ -25,7 +18,7 @@ def built_bottle? f
end end
def bottle_current? f def bottle_current? f
!f.bottle_url.nil? && Pathname.new(f.bottle_url).version == f.version f.bottle_url && f.bottle_sha1 && Pathname.new(f.bottle_url).version == f.version
end end
def bottle_native_suffix def bottle_native_suffix

2
Library/Homebrew/formula.rb
View File

@ -664,7 +664,7 @@ private
key, value = sha1.shift key, value = sha1.shift
@sha1 = key if value == MacOS.cat @sha1 = key if value == MacOS.cat
when String when String
@sha1 = sha1 @sha1 = sha1 if MacOS.lion?
end end
end end