From 8cdf4d8ebf439eb9a9ffcaa0e455ced9459e1e41 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 8 Mar 2014 19:08:47 -0600 Subject: Remove "--fresh" option from installer Turns out that this doesn't really work at all. `brew install` _never_ reuses options in the first place, and using this option with `brew upgrade` results in some nasty corner cases in passing options to dependencies. --- Library/Contributions/manpages/brew.1.md | 5 +---- Library/Homebrew/extend/ARGV.rb | 1 - Library/Homebrew/formula_installer.rb | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) (limited to 'Library') diff --git a/Library/Contributions/manpages/brew.1.md b/Library/Contributions/manpages/brew.1.md index 5f20c8cc1..96a5f9485 100644 --- a/Library/Contributions/manpages/brew.1.md +++ b/Library/Contributions/manpages/brew.1.md @@ -153,7 +153,7 @@ Note that these flags should only appear after a command. Print a JSON representation of . Currently the only accepted value for is `v1`. - * `install [--debug] [--env=] [--ignore-dependencies] [--only-dependencies] [--fresh] [--cc=] [--build-from-source] [--devel|--HEAD]` : + * `install [--debug] [--env=] [--ignore-dependencies] [--only-dependencies] [--cc=] [--build-from-source] [--devel|--HEAD]` : Install . is usually the name of the formula to install, but it can be specified @@ -175,9 +175,6 @@ Note that these flags should only appear after a command. If `--only-dependencies` is passed, install the dependencies with specified options but do not install the specified formula. - If `--fresh` is passed, the installation process will not re-use any - options from previous installs. - If `--cc=` is passed, attempt to compile using . should be the name of the compiler's executable, for instance `gcc-4.2` for Apple's GCC 4.2, or `gcc-4.8` for a Homebrew-provided GCC diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 476ef62df..5bc88142b 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -187,7 +187,6 @@ module HomebrewArgvExtension --build-bottle --debug -d --devel - --fresh --interactive -i --HEAD ] diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index d341094f8..e93263c08 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -394,7 +394,7 @@ class FormulaInstaller def build_argv opts = Options.coerce(sanitized_ARGV_options) - opts.concat(options) unless opts.include? "--fresh" + opts.concat(options) opts << Option.new("--build-from-source") # don't download bottle end -- cgit v1.2.3