fetch: don't flag fs modification

This commit is contained in:
Dominyk Tiller 2015-07-19 20:37:45 +01:00
parent b06af00d76
commit c0ef6567b8

View File

@ -32,6 +32,7 @@ module Homebrew
def fetch_bottle? f def fetch_bottle? f
return true if ARGV.force_bottle? && f.bottle return true if ARGV.force_bottle? && f.bottle
return false unless f.bottle && f.pour_bottle? return false unless f.bottle && f.pour_bottle?
return false if ARGV.build_from_source? || ARGV.build_bottle?
if f.file_modified? if f.file_modified?
filename = f.path.to_s.gsub("#{HOMEBREW_PREFIX}/", "") filename = f.path.to_s.gsub("#{HOMEBREW_PREFIX}/", "")
opoo "Formula file is modified!" opoo "Formula file is modified!"
@ -39,7 +40,6 @@ module Homebrew
puts "To fetch the bottle instead, run with --force-bottle" puts "To fetch the bottle instead, run with --force-bottle"
return false return false
end end
return false if ARGV.build_from_source? || ARGV.build_bottle?
return false unless f.bottle.compatible_cellar? return false unless f.bottle.compatible_cellar?
return true return true
end end