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

Renaming pouring method to pourable?.

Browse Source
This commit is contained in:
Mike McQuaid 2011-06-22 17:16:26 +01:00
parent bd2fa562c3
commit 6d3c488d4a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/formula.rb
View File

@ -119,7 +119,7 @@ class Formula
@url = @head @url = @head
@version = 'HEAD' @version = 'HEAD'
@spec_to_use = @unstable @spec_to_use = @unstable
elsif pouring elsif pourable?
@spec_to_use = BottleSoftwareSpecification.new(@bottle, @specs) @spec_to_use = BottleSoftwareSpecification.new(@bottle, @specs)
else else
if @stable.nil? if @stable.nil?
@ -456,7 +456,7 @@ class Formula
end end
end end
def pouring def pourable?
@bottle and not ARGV.build_from_source? @bottle and not ARGV.build_from_source?
end end
@ -518,7 +518,7 @@ private
def verify_download_integrity fn def verify_download_integrity fn
require 'digest' require 'digest'
if not pouring if not pourable?
type=CHECKSUM_TYPES.detect { |type| instance_variable_defined?("@#{type}") } type=CHECKSUM_TYPES.detect { |type| instance_variable_defined?("@#{type}") }
type ||= :md5 type ||= :md5
supplied=instance_variable_get("@#{type}") supplied=instance_variable_get("@#{type}")
@ -552,7 +552,7 @@ EOF
fetched = @downloader.fetch fetched = @downloader.fetch
verify_download_integrity fetched if fetched.kind_of? Pathname verify_download_integrity fetched if fetched.kind_of? Pathname
if not pouring if not pourable?
mktemp do mktemp do
@downloader.stage @downloader.stage
yield yield
@ -566,7 +566,7 @@ EOF
end end
def patch def patch
return if patches.nil? or pouring return if patches.nil? or pourable?
if not patches.kind_of? Hash if not patches.kind_of? Hash
# We assume -p1 # We assume -p1