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

remove duplicate "Error" in onoe/odie arguments

Browse Source
This commit is contained in:
EricFromCanada 2020-07-06 15:28:50 -04:00
parent f5e1557154
commit a72ddfdc67
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/brew.sh
View File

@ -92,7 +92,7 @@ odie() {
} }
safe_cd() { safe_cd() {
cd "$@" >/dev/null || odie "Error: failed to cd to $*!" cd "$@" >/dev/null || odie "Failed to cd to $*!"
} }
brew() { brew() {

6
Library/Homebrew/migrator.rb
View File

@ -220,7 +220,7 @@ class Migrator
rescue Interrupt rescue Interrupt
ignore_interrupts { backup_oldname } ignore_interrupts { backup_oldname }
rescue Exception => e # rubocop:disable Lint/RescueException rescue Exception => e # rubocop:disable Lint/RescueException
onoe "Error occurred while migrating." onoe "The migration did not complete successfully."
puts e puts e
puts e.backtrace if debug? puts e.backtrace if debug?
puts "Backing up..." puts "Backing up..."
@ -314,14 +314,14 @@ class Migrator
begin begin
new_keg.link(overwrite: true, verbose: verbose?) new_keg.link(overwrite: true, verbose: verbose?)
rescue Keg::ConflictError => e rescue Keg::ConflictError => e
onoe "Error while executing `brew link` step on #{newname}" onoe "The `brew link` step did not complete successfully."
puts e puts e
puts puts
puts "Possible conflicting files are:" puts "Possible conflicting files are:"
new_keg.link(dry_run: true, overwrite: true, verbose: verbose?) new_keg.link(dry_run: true, overwrite: true, verbose: verbose?)
raise raise
rescue Keg::LinkError => e rescue Keg::LinkError => e
onoe "Error while linking" onoe "The `brew link` step did not complete successfully."
puts e puts e
puts puts
puts "You can try again using:" puts "You can try again using:"