Merge pull request #15643 from carlocab/cache-bottle-tag

cmd/--cache: undeprecate `--bottle-tag`
This commit is contained in:
Carlo Cabrera 2023-07-11 01:52:42 +08:00 committed by GitHub
commit 8c72df5213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -27,8 +27,7 @@ module Homebrew
switch "--force-bottle", switch "--force-bottle",
description: "Show the cache file used when pouring a bottle." description: "Show the cache file used when pouring a bottle."
flag "--bottle-tag=", flag "--bottle-tag=",
description: "Show the cache file used when pouring a bottle for the given tag.", description: "Show the cache file used when pouring a bottle for the given tag."
hidden: true
switch "--HEAD", switch "--HEAD",
description: "Show the cache file used when building from HEAD." description: "Show the cache file used when building from HEAD."
switch "--formula", "--formulae", switch "--formula", "--formulae",
@ -97,7 +96,6 @@ module Homebrew
arch: args.arch&.to_sym, arch: args.arch&.to_sym,
) )
bottle_tag = if (bottle_tag = args.bottle_tag&.to_sym) bottle_tag = if (bottle_tag = args.bottle_tag&.to_sym)
odeprecated "brew --cache --bottle-tag", "brew --cache --os --arch"
Utils::Bottles::Tag.from_symbol(bottle_tag) Utils::Bottles::Tag.from_symbol(bottle_tag)
else else
Utils::Bottles::Tag.new(system: os, arch: arch) Utils::Bottles::Tag.new(system: os, arch: arch)