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

Merge pull request #9483 from Homebrew/revert-9422-untap-force

Browse Source 
Revert "untap: add --force switch"
This commit is contained in:
Mike McQuaid 2020-12-09 13:58:52 +00:00 committed by GitHub
commit 23fccdb380
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/cmd/untap.rb
View File

@ -2,7 +2,6 @@
# frozen_string_literal: true # frozen_string_literal: true
require "cli/parser" require "cli/parser"
require "formula"
module Homebrew module Homebrew
extend T::Sig extend T::Sig
@ -17,8 +16,6 @@ module Homebrew
Remove a tapped formula repository. Remove a tapped formula repository.
EOS EOS
switch "-f", "--force",
description: "Untap even if formulae or casks from this tap are currently installed."
min_named 1 min_named 1
end end
@ -31,23 +28,6 @@ module Homebrew
tap = Tap.fetch(tapname) tap = Tap.fetch(tapname)
odie "Untapping #{tap} is not allowed" if tap.core_tap? odie "Untapping #{tap} is not allowed" if tap.core_tap?
installed_tap_formulae = Formula.installed.select { |formula| formula.tap == tap }
installed_tap_casks = Cask::Caskroom.casks.select { |cask| cask.tap == tap }
if installed_tap_formulae.length.positive? || installed_tap_casks.length.positive?
if args.force?
opoo <<~EOS
Untapping #{tap} even though it contains the following installed formulae or casks:
#{(installed_tap_formulae + installed_tap_casks.map(&:token)).join("\n")}
EOS
else
odie <<~EOS
Refusing to untap #{tap} because it contains the following installed formulae or casks:
#{(installed_tap_formulae + installed_tap_casks.map(&:token)).join("\n")}
EOS
end
end
tap.uninstall tap.uninstall
end end
end end

3
docs/Manpage.md
View File

@ -572,9 +572,6 @@ See also `pin`.
Remove a tapped formula repository. Remove a tapped formula repository.
* `-f`, `--force`:
Untap even if formulae or casks from this tap are currently installed.
### `update` [*`options`*] ### `update` [*`options`*]
Fetch the newest version of Homebrew and all formulae from GitHub using `git`(1) and perform any necessary migrations. Fetch the newest version of Homebrew and all formulae from GitHub using `git`(1) and perform any necessary migrations.

4
manpages/brew.1
View File

@ -770,10 +770,6 @@ Unpin \fIformula\fR, allowing them to be upgraded by \fBbrew upgrade\fR \fIformu
.SS "\fBuntap\fR \fItap\fR" .SS "\fBuntap\fR \fItap\fR"
Remove a tapped formula repository\. Remove a tapped formula repository\.
. .
.TP
\fB\-f\fR, \fB\-\-force\fR
Untap even if formulae or casks from this tap are currently installed\.
.
.SS "\fBupdate\fR [\fIoptions\fR]" .SS "\fBupdate\fR [\fIoptions\fR]"
Fetch the newest version of Homebrew and all formulae from GitHub using \fBgit\fR(1) and perform any necessary migrations\. Fetch the newest version of Homebrew and all formulae from GitHub using \fBgit\fR(1) and perform any necessary migrations\.
. .