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

Don't download bottles when building from source

Browse Source 
The recent fix that prevents "-v" from triggering source downloads
exposed a different bug that allowed the build script to download the
bottled package instead of the source package; fix the logic.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-08-28 14:27:08 -05:00
parent c1220975b9
commit d423519766
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/formula_installer.rb
View File

@ -201,15 +201,11 @@ class FormulaInstaller
ENV['HOMEBREW_ERROR_PIPE'] = write.to_i.to_s ENV['HOMEBREW_ERROR_PIPE'] = write.to_i.to_s
args = ARGV.clone args = ARGV.clone
unless args.include? '--fresh' args.concat tab.used_options unless tab.nil? or args.include? '--fresh'
unless tab.nil? # FIXME: enforce the download of the non-bottled package
args.concat tab.used_options # in the spawned Ruby process.
# FIXME: enforce the download of the non-bottled package args << '--build-from-source'
# in the spawned Ruby process. args.uniq! # Just in case some dupes were added
args << '--build-from-source'
end
args.uniq! # Just in case some dupes were added
end
fork do fork do
begin begin