mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

bottles: protect against a nil bottle

Browse Source 
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-07-04 23:15:45 -05:00
parent 1050261316
commit a38e2284ea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/bottles.rb
View File

@ -22,17 +22,17 @@ def built_bottle? f
end end
def bottle_current? f def bottle_current? f
f.bottle.url && !f.bottle.checksum.empty? && f.bottle.version == f.stable.version f.bottle and f.bottle.url && !f.bottle.checksum.empty? && f.bottle.version == f.stable.version
end end
def bottle_file_outdated? f, file def bottle_file_outdated? f, file
filename = file.basename.to_s filename = file.basename.to_s
return nil unless (filename.match(bottle_regex) or filename.match(old_bottle_regex)) and f.bottle_url return nil unless (filename.match(bottle_regex) or filename.match(old_bottle_regex)) and f.bottle and f.bottle.url
bottle_ext = filename.match(bottle_native_regex).captures.first rescue nil bottle_ext = filename.match(bottle_native_regex).captures.first rescue nil
bottle_ext ||= filename.match(old_bottle_regex).captures.first rescue nil bottle_ext ||= filename.match(old_bottle_regex).captures.first rescue nil
bottle_url_ext = f.bottle_url.match(bottle_native_regex).captures.first rescue nil bottle_url_ext = f.bottle.url.match(bottle_native_regex).captures.first rescue nil
bottle_url_ext ||= f.bottle_url.match(old_bottle_regex).captures.first rescue nil bottle_url_ext ||= f.bottle.url.match(old_bottle_regex).captures.first rescue nil
bottle_ext && bottle_url_ext && bottle_ext != bottle_url_ext bottle_ext && bottle_url_ext && bottle_ext != bottle_url_ext
end end