From a72ddfdc675b4675207506c4626fca1b019b54f7 Mon Sep 17 00:00:00 2001
From: EricFromCanada <enk3@outlook.com>
Date: Mon, 6 Jul 2020 15:28:50 -0400
Subject: [PATCH] remove duplicate "Error" in onoe/odie arguments

---
 Library/Homebrew/brew.sh     | 2 +-
 Library/Homebrew/migrator.rb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 59c6ec3817..59069b3946 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -92,7 +92,7 @@ odie() {
 }
 
 safe_cd() {
-  cd "$@" >/dev/null || odie "Error: failed to cd to $*!"
+  cd "$@" >/dev/null || odie "Failed to cd to $*!"
 }
 
 brew() {
diff --git a/Library/Homebrew/migrator.rb b/Library/Homebrew/migrator.rb
index 778a41ea4e..e065a2de63 100644
--- a/Library/Homebrew/migrator.rb
+++ b/Library/Homebrew/migrator.rb
@@ -220,7 +220,7 @@ class Migrator
   rescue Interrupt
     ignore_interrupts { backup_oldname }
   rescue Exception => e # rubocop:disable Lint/RescueException
-    onoe "Error occurred while migrating."
+    onoe "The migration did not complete successfully."
     puts e
     puts e.backtrace if debug?
     puts "Backing up..."
@@ -314,14 +314,14 @@ class Migrator
     begin
       new_keg.link(overwrite: true, verbose: verbose?)
     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
       puts "Possible conflicting files are:"
       new_keg.link(dry_run: true, overwrite: true, verbose: verbose?)
       raise
     rescue Keg::LinkError => e
-      onoe "Error while linking"
+      onoe "The `brew link` step did not complete successfully."
       puts e
       puts
       puts "You can try again using:"