diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/bottles.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb index d2abbf03f..12679e229 100644 --- a/Library/Homebrew/bottles.rb +++ b/Library/Homebrew/bottles.rb @@ -22,17 +22,17 @@ def built_bottle? f end 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 def bottle_file_outdated? f, file 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(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(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(old_bottle_regex).captures.first rescue nil bottle_ext && bottle_url_ext && bottle_ext != bottle_url_ext end |