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

Revert "upgrade: announce usage of --all."

Browse Source 
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>
This commit is contained in:
Mike McQuaid 2015-06-04 11:24:32 +01:00
parent ef7eb0750c
commit f4af833714
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/cmd/upgrade.rb
View File

@ -5,14 +5,7 @@ module Homebrew
def upgrade def upgrade
Homebrew.perform_preinstall_checks Homebrew.perform_preinstall_checks
if ARGV.include?("--all") || ARGV.named.empty? if 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
outdated = Homebrew.outdated_brews(Formula.installed) outdated = Homebrew.outdated_brews(Formula.installed)
exit 0 if outdated.empty? exit 0 if outdated.empty?
elsif ARGV.named.any? elsif ARGV.named.any?
@ -27,11 +20,6 @@ module Homebrew
end end
end end
exit 1 if outdated.empty? 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 end
unless upgrade_pinned? unless upgrade_pinned?

6
Library/Homebrew/manpages/brew.1.md
View File

@ -403,15 +403,11 @@ Note that these flags should only appear after a command.
If `--rebase` is specified then `git pull --rebase` is used. If `--rebase` is specified then `git pull --rebase` is used.
* `upgrade [--all] [install-options]` [<formulae>]: * `upgrade [install-options]` [<formulae>]:
Upgrade outdated, unpinned brews. Upgrade outdated, unpinned brews.
Options for the `install` command are also valid here. 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 <formulae> are given, upgrade only the specified brews (but do so even
if they are pinned; see `pin`, `unpin`). if they are pinned; see `pin`, `unpin`).

5
share/man/man1/brew.1
View File

@ -432,16 +432,13 @@ Fetch the newest version of Homebrew and all formulae from GitHub using \fBgit\f
If \fB\-\-rebase\fR is specified then \fBgit pull \-\-rebase\fR is used\. If \fB\-\-rebase\fR is specified then \fBgit pull \-\-rebase\fR is used\.
. .
.TP .TP
\fBupgrade [\-\-all] [install\-options]\fR [\fIformulae\fR] \fBupgrade [install\-options]\fR [\fIformulae\fR]
Upgrade outdated, unpinned brews\. Upgrade outdated, unpinned brews\.
. .
.IP .IP
Options for the \fBinstall\fR command are also valid here\. Options for the \fBinstall\fR command are also valid here\.
. .
.IP .IP
If \fB\-\-all\fR is passed, upgrade all formulae\. This is currently the same behaviour as without \fB\-\-all\fR but soon \fB\-\-all\fR will be required to upgrade all formulae\.
.
.IP
If \fIformulae\fR are given, upgrade only the specified brews (but do so even if they are pinned; see \fBpin\fR, \fBunpin\fR)\. If \fIformulae\fR are given, upgrade only the specified brews (but do so even if they are pinned; see \fBpin\fR, \fBunpin\fR)\.
. .
.TP .TP