Merge pull request #17052 from toobuntu/relax-display-times

Allow `--display-times` with `--cask`
This commit is contained in:
Mike McQuaid 2024-04-09 09:36:30 +01:00 committed by GitHub
commit 8acb03b0f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 14 deletions

View File

@ -341,7 +341,7 @@ on_request: true)
missing_formulae_and_casks = missing_cask_and_formula_dependencies
if missing_formulae_and_casks.empty?
puts "All formula dependencies satisfied."
puts "All dependencies satisfied."
return
end

View File

@ -32,6 +32,9 @@ module Homebrew
switch "-d", "--debug",
description: "If brewing fails, open an interactive debugging session with access to IRB " \
"or a shell inside the temporary build directory."
switch "--display-times",
env: :display_install_times,
description: "Print install times for each package at the end of the run."
switch "-f", "--force",
description: "Install formulae without checking for previously installed keg-only or " \
"non-migrated versions. When installing casks, overwrite existing files " \
@ -103,10 +106,6 @@ module Homebrew
description: "Optimise bottles for the specified architecture rather than the oldest " \
"architecture supported by the version of macOS the bottles are built on.",
}],
[:switch, "--display-times", {
env: :display_install_times,
description: "Print install times for each package at the end of the run.",
}],
[:switch, "-i", "--interactive", {
description: "Download and patch <formula>, then open a shell. This allows the user to " \
"run `./configure --help` and otherwise determine how to turn the software " \
@ -291,7 +290,7 @@ module Homebrew
)
end
return if installed_formulae.empty?
return if formulae.any? && installed_formulae.empty?
Install.perform_preinstall_checks(cc: args.cc)

View File

@ -31,6 +31,9 @@ module Homebrew
switch "-d", "--debug",
description: "If brewing fails, open an interactive debugging session with access to IRB " \
"or a shell inside the temporary build directory."
switch "--display-times",
env: :display_install_times,
description: "Print install times for each package at the end of the run."
switch "-f", "--force",
description: "Install without checking for previously installed keg-only or " \
"non-migrated versions."
@ -57,10 +60,6 @@ module Homebrew
depends_on: "--build-from-source",
description: "Generate debug symbols on build. Source will be retained in a cache directory.",
}],
[:switch, "--display-times", {
env: :display_install_times,
description: "Print install times for each formula at the end of the run.",
}],
[:switch, "-g", "--git", {
description: "Create a Git repository, useful for creating patches to the software.",
}],

View File

@ -28,6 +28,9 @@ module Homebrew
switch "-d", "--debug",
description: "If brewing fails, open an interactive debugging session with access to IRB " \
"or a shell inside the temporary build directory."
switch "--display-times",
env: :display_install_times,
description: "Print install times for each package at the end of the run."
switch "-f", "--force",
description: "Install formulae without checking for previously installed keg-only or " \
"non-migrated versions. When installing casks, overwrite existing files " \
@ -69,10 +72,6 @@ module Homebrew
depends_on: "--build-from-source",
description: "Generate debug symbols on build. Source will be retained in a cache directory.",
}],
[:switch, "--display-times", {
env: :display_install_times,
description: "Print install times for each package at the end of the run.",
}],
[:switch, "--overwrite", {
description: "Delete files that already exist in the prefix while linking.",
}],