mirror of
https://github.com/Homebrew/brew.git
synced 2025-07-14 16:09:03 +08:00
Merge pull request #16301 from apainintheneck/update-pinned-formula-messaging
cmd/pin: Update pinned formula messaging
This commit is contained in:
commit
cd8a9c02cb
@ -13,6 +13,9 @@ module Homebrew
|
|||||||
description <<~EOS
|
description <<~EOS
|
||||||
Pin the specified <formula>, preventing them from being upgraded when
|
Pin the specified <formula>, preventing them from being upgraded when
|
||||||
issuing the `brew upgrade` <formula> command. See also `unpin`.
|
issuing the `brew upgrade` <formula> command. See also `unpin`.
|
||||||
|
|
||||||
|
Note: Other packages which depend on newer versions of a pinned formula
|
||||||
|
might not install or run correctly.
|
||||||
EOS
|
EOS
|
||||||
|
|
||||||
named_args :installed_formula, min: 1
|
named_args :installed_formula, min: 1
|
||||||
|
@ -62,6 +62,7 @@ module Homebrew
|
|||||||
}],
|
}],
|
||||||
[:switch, "--ignore-pinned", {
|
[:switch, "--ignore-pinned", {
|
||||||
description: "Set a successful exit status even if pinned formulae are not upgraded.",
|
description: "Set a successful exit status even if pinned formulae are not upgraded.",
|
||||||
|
hidden: true,
|
||||||
}],
|
}],
|
||||||
[:switch, "--keep-tmp", {
|
[:switch, "--keep-tmp", {
|
||||||
description: "Retain the temporary files created during installation.",
|
description: "Retain the temporary files created during installation.",
|
||||||
@ -126,6 +127,9 @@ module Homebrew
|
|||||||
def upgrade
|
def upgrade
|
||||||
args = upgrade_args.parse
|
args = upgrade_args.parse
|
||||||
|
|
||||||
|
# Deprecated since this is now the default behavior.
|
||||||
|
odeprecated "`brew upgrade --ignore-pinned`" if args.ignore_pinned?
|
||||||
|
|
||||||
formulae, casks = args.named.to_resolved_formulae_to_casks
|
formulae, casks = args.named.to_resolved_formulae_to_casks
|
||||||
# If one or more formulae are specified, but no casks were
|
# If one or more formulae are specified, but no casks were
|
||||||
# specified, we want to make note of that so we don't
|
# specified, we want to make note of that so we don't
|
||||||
@ -191,8 +195,11 @@ module Homebrew
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if !pinned.empty? && !args.ignore_pinned?
|
if pinned.any?
|
||||||
ofail "Not upgrading #{pinned.count} pinned #{Utils.pluralize("package", pinned.count)}:"
|
Kernel.public_send(
|
||||||
|
formulae.any? ? :ofail : :opoo, # only fail when pinned formulae are named explicitly
|
||||||
|
"Not upgrading #{pinned.count} pinned #{Utils.pluralize("package", pinned.count)}:",
|
||||||
|
)
|
||||||
puts pinned.map { |f| "#{f.full_specified_name} #{f.pkg_version}" } * ", "
|
puts pinned.map { |f| "#{f.full_specified_name} #{f.pkg_version}" } * ", "
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -337,7 +337,7 @@ module Homebrew
|
|||||||
|
|
||||||
if pinned_dependents.present?
|
if pinned_dependents.present?
|
||||||
plural = Utils.pluralize("dependent", pinned_dependents.count)
|
plural = Utils.pluralize("dependent", pinned_dependents.count)
|
||||||
ohai "Not upgrading #{pinned_dependents.count} pinned #{plural}:"
|
opoo "Not upgrading #{pinned_dependents.count} pinned #{plural}:"
|
||||||
puts(pinned_dependents.map do |f|
|
puts(pinned_dependents.map do |f|
|
||||||
"#{f.full_specified_name} #{f.pkg_version}"
|
"#{f.full_specified_name} #{f.pkg_version}"
|
||||||
end.join(", "))
|
end.join(", "))
|
||||||
|
@ -2562,7 +2562,6 @@ _brew_upgrade() {
|
|||||||
--greedy-auto-updates
|
--greedy-auto-updates
|
||||||
--greedy-latest
|
--greedy-latest
|
||||||
--help
|
--help
|
||||||
--ignore-pinned
|
|
||||||
--input-methoddir
|
--input-methoddir
|
||||||
--interactive
|
--interactive
|
||||||
--internet-plugindir
|
--internet-plugindir
|
||||||
|
@ -1669,7 +1669,6 @@ __fish_brew_complete_arg 'upgrade' -l greedy -d 'Also include casks with `auto_u
|
|||||||
__fish_brew_complete_arg 'upgrade' -l greedy-auto-updates -d 'Also include casks with `auto_updates true`'
|
__fish_brew_complete_arg 'upgrade' -l greedy-auto-updates -d 'Also include casks with `auto_updates true`'
|
||||||
__fish_brew_complete_arg 'upgrade' -l greedy-latest -d 'Also include casks with `version :latest`'
|
__fish_brew_complete_arg 'upgrade' -l greedy-latest -d 'Also include casks with `version :latest`'
|
||||||
__fish_brew_complete_arg 'upgrade' -l help -d 'Show this message'
|
__fish_brew_complete_arg 'upgrade' -l help -d 'Show this message'
|
||||||
__fish_brew_complete_arg 'upgrade' -l ignore-pinned -d 'Set a successful exit status even if pinned formulae are not upgraded'
|
|
||||||
__fish_brew_complete_arg 'upgrade' -l input-methoddir -d 'Target location for Input Methods (default: `~/Library/Input Methods`)'
|
__fish_brew_complete_arg 'upgrade' -l input-methoddir -d 'Target location for Input Methods (default: `~/Library/Input Methods`)'
|
||||||
__fish_brew_complete_arg 'upgrade' -l interactive -d 'Download and patch formula, then open a shell. This allows the user to run `./configure --help` and otherwise determine how to turn the software package into a Homebrew package'
|
__fish_brew_complete_arg 'upgrade' -l interactive -d 'Download and patch formula, then open a shell. This allows the user to run `./configure --help` and otherwise determine how to turn the software package into a Homebrew package'
|
||||||
__fish_brew_complete_arg 'upgrade' -l internet-plugindir -d 'Target location for Internet Plugins (default: `~/Library/Internet Plug-Ins`)'
|
__fish_brew_complete_arg 'upgrade' -l internet-plugindir -d 'Target location for Internet Plugins (default: `~/Library/Internet Plug-Ins`)'
|
||||||
|
@ -2057,7 +2057,6 @@ _brew_upgrade() {
|
|||||||
'(--formula)--greedy-auto-updates[Also include casks with `auto_updates true`]' \
|
'(--formula)--greedy-auto-updates[Also include casks with `auto_updates true`]' \
|
||||||
'(--formula)--greedy-latest[Also include casks with `version :latest`]' \
|
'(--formula)--greedy-latest[Also include casks with `version :latest`]' \
|
||||||
'--help[Show this message]' \
|
'--help[Show this message]' \
|
||||||
'(--cask)--ignore-pinned[Set a successful exit status even if pinned formulae are not upgraded]' \
|
|
||||||
'(--formula)--input-methoddir[Target location for Input Methods (default: `~/Library/Input Methods`)]' \
|
'(--formula)--input-methoddir[Target location for Input Methods (default: `~/Library/Input Methods`)]' \
|
||||||
'(--cask)--interactive[Download and patch formula, then open a shell. This allows the user to run `./configure --help` and otherwise determine how to turn the software package into a Homebrew package]' \
|
'(--cask)--interactive[Download and patch formula, then open a shell. This allows the user to run `./configure --help` and otherwise determine how to turn the software package into a Homebrew package]' \
|
||||||
'(--formula)--internet-plugindir[Target location for Internet Plugins (default: `~/Library/Internet Plug-Ins`)]' \
|
'(--formula)--internet-plugindir[Target location for Internet Plugins (default: `~/Library/Internet Plug-Ins`)]' \
|
||||||
|
@ -541,6 +541,9 @@ information is displayed in interactive shells, and suppressed otherwise.
|
|||||||
Pin the specified *`formula`*, preventing them from being upgraded when
|
Pin the specified *`formula`*, preventing them from being upgraded when
|
||||||
issuing the `brew upgrade` *`formula`* command. See also `unpin`.
|
issuing the `brew upgrade` *`formula`* command. See also `unpin`.
|
||||||
|
|
||||||
|
Note: Other packages which depend on newer versions of a pinned formula
|
||||||
|
might not install or run correctly.
|
||||||
|
|
||||||
### `postinstall`, `post_install` *`installed_formula`* [...]
|
### `postinstall`, `post_install` *`installed_formula`* [...]
|
||||||
|
|
||||||
Rerun the post-install steps for *`formula`*.
|
Rerun the post-install steps for *`formula`*.
|
||||||
@ -797,8 +800,6 @@ upgraded formulae or, every 30 days, for all formulae.
|
|||||||
Install from a bottle if it exists for the current or newest version of macOS, even if it would not normally be used for installation.
|
Install from a bottle if it exists for the current or newest version of macOS, even if it would not normally be used for installation.
|
||||||
* `--fetch-HEAD`:
|
* `--fetch-HEAD`:
|
||||||
Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository's HEAD will only be checked for updates when a new stable or development version has been released.
|
Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository's HEAD will only be checked for updates when a new stable or development version has been released.
|
||||||
* `--ignore-pinned`:
|
|
||||||
Set a successful exit status even if pinned formulae are not upgraded.
|
|
||||||
* `--keep-tmp`:
|
* `--keep-tmp`:
|
||||||
Retain the temporary files created during installation.
|
Retain the temporary files created during installation.
|
||||||
* `--debug-symbols`:
|
* `--debug-symbols`:
|
||||||
|
@ -758,6 +758,9 @@ Also include outdated casks including those with \fBauto_updates true\fR\.
|
|||||||
.SS "\fBpin\fR \fIinstalled_formula\fR [\.\.\.]"
|
.SS "\fBpin\fR \fIinstalled_formula\fR [\.\.\.]"
|
||||||
Pin the specified \fIformula\fR, preventing them from being upgraded when issuing the \fBbrew upgrade\fR \fIformula\fR command\. See also \fBunpin\fR\.
|
Pin the specified \fIformula\fR, preventing them from being upgraded when issuing the \fBbrew upgrade\fR \fIformula\fR command\. See also \fBunpin\fR\.
|
||||||
.
|
.
|
||||||
|
.P
|
||||||
|
Note: Other packages which depend on newer versions of a pinned formula might not install or run correctly\.
|
||||||
|
.
|
||||||
.SS "\fBpostinstall\fR, \fBpost_install\fR \fIinstalled_formula\fR [\.\.\.]"
|
.SS "\fBpostinstall\fR, \fBpost_install\fR \fIinstalled_formula\fR [\.\.\.]"
|
||||||
Rerun the post\-install steps for \fIformula\fR\.
|
Rerun the post\-install steps for \fIformula\fR\.
|
||||||
.
|
.
|
||||||
@ -1103,10 +1106,6 @@ Install from a bottle if it exists for the current or newest version of macOS, e
|
|||||||
Fetch the upstream repository to detect if the HEAD installation of the formula is outdated\. Otherwise, the repository\'s HEAD will only be checked for updates when a new stable or development version has been released\.
|
Fetch the upstream repository to detect if the HEAD installation of the formula is outdated\. Otherwise, the repository\'s HEAD will only be checked for updates when a new stable or development version has been released\.
|
||||||
.
|
.
|
||||||
.TP
|
.TP
|
||||||
\fB\-\-ignore\-pinned\fR
|
|
||||||
Set a successful exit status even if pinned formulae are not upgraded\.
|
|
||||||
.
|
|
||||||
.TP
|
|
||||||
\fB\-\-keep\-tmp\fR
|
\fB\-\-keep\-tmp\fR
|
||||||
Retain the temporary files created during installation\.
|
Retain the temporary files created during installation\.
|
||||||
.
|
.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user