diff options
| author | Jack Nagel | 2012-08-28 14:27:08 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-08-28 18:00:27 -0500 |
| commit | d4235197665b019263b4e28d2a8adb058035c7f7 (patch) | |
| tree | 112903c018ab29dd6479da92775365833604f9d6 /Library | |
| parent | c1220975b91d7627ce8b868e2ee36bcabe908fc2 (diff) | |
| download | brew-d4235197665b019263b4e28d2a8adb058035c7f7.tar.bz2 | |
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 <jacknagel@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 14 |
1 files changed, 5 insertions, 9 deletions
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 |