From 5131cd45f172fdb1daea704dbbca3a391a5cf05e Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 28 Aug 2012 14:27:08 -0500 Subject: Don't download bottles when building from 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 --- Library/Homebrew/formula_installer.rb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index ecdcba24b..08ddd192f 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -201,15 +201,11 @@ class FormulaInstaller ENV['HOMEBREW_ERROR_PIPE'] = write.to_i.to_s args = ARGV.clone - unless args.include? '--fresh' - unless tab.nil? - args.concat tab.used_options - # FIXME: enforce the download of the non-bottled package - # in the spawned Ruby process. - args << '--build-from-source' - end - args.uniq! # Just in case some dupes were added - end + args.concat tab.used_options unless tab.nil? or args.include? '--fresh' + # FIXME: enforce the download of the non-bottled package + # in the spawned Ruby process. + args << '--build-from-source' + args.uniq! # Just in case some dupes were added fork do begin -- cgit v1.2.3