diff options
| author | Mike McQuaid | 2015-06-04 11:24:32 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2015-06-05 14:20:21 +0100 |
| commit | f4af8337149659eeabb5a85017b80a5c52c602fc (patch) | |
| tree | 041609dd1cf6b84fca84353a74e7ad6207779c15 /Library | |
| parent | ef7eb0750c7791db5165293f7d7f6352805516bd (diff) | |
| download | brew-f4af8337149659eeabb5a85017b80a5c52c602fc.tar.bz2 | |
Revert "upgrade: announce usage of --all."
This reverts commit 9032f165bec3d0c7452169093fab32578816043b.
This seems to have been universally unpopular so let's revert it.
Closes Homebrew/homebrew#40372.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/upgrade.rb | 14 | ||||
| -rw-r--r-- | Library/Homebrew/manpages/brew.1.md | 6 |
2 files changed, 2 insertions, 18 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 12833c15a..3c90c0c95 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -5,14 +5,7 @@ module Homebrew def upgrade Homebrew.perform_preinstall_checks - if ARGV.include?("--all") || ARGV.named.empty? - unless ARGV.include? "--all" - opoo <<-EOS.undent - brew upgrade with no arguments will change behaviour soon! - It currently upgrades all formula but this will soon change to require '--all'. - Please update any workflows, documentation and scripts! - EOS - end + if ARGV.named.empty? outdated = Homebrew.outdated_brews(Formula.installed) exit 0 if outdated.empty? elsif ARGV.named.any? @@ -27,11 +20,6 @@ module Homebrew end end exit 1 if outdated.empty? - else - # This will currently never be reached but is implemented to make the - # migration to --all easier in the future (as just the ARGV.named.empty? - # will need removed above). - odie "Either --all or one or more formulae must be specified!" end unless upgrade_pinned? diff --git a/Library/Homebrew/manpages/brew.1.md b/Library/Homebrew/manpages/brew.1.md index be9d47d78..e328ff9fd 100644 --- a/Library/Homebrew/manpages/brew.1.md +++ b/Library/Homebrew/manpages/brew.1.md @@ -403,15 +403,11 @@ Note that these flags should only appear after a command. If `--rebase` is specified then `git pull --rebase` is used. - * `upgrade [--all] [install-options]` [<formulae>]: + * `upgrade [install-options]` [<formulae>]: Upgrade outdated, unpinned brews. Options for the `install` command are also valid here. - If `--all` is passed, upgrade all formulae. This is currently the same - behaviour as without `--all` but soon `--all` will be required to upgrade - all formulae. - If <formulae> are given, upgrade only the specified brews (but do so even if they are pinned; see `pin`, `unpin`). |