From 3c60c745fca4a98cf6e04ebbb3d7b8462373e75a Mon Sep 17 00:00:00 2001
From: William Bradford Clark <wclark@redhat.com>
Date: Wed, 15 Jul 2020 14:02:44 -0400
Subject: [PATCH] Fixes #29296 - remove --upgrade

---
 katello/hooks/boot/30-upgrade.rb            | 6 ------
 katello/hooks/pre_validations/29-upgrade.rb | 3 ---
 2 files changed, 9 deletions(-)
 delete mode 100644 katello/hooks/boot/30-upgrade.rb
 delete mode 100644 katello/hooks/pre_validations/29-upgrade.rb

diff --git a/katello/hooks/boot/30-upgrade.rb b/katello/hooks/boot/30-upgrade.rb
deleted file mode 100644
index 8b826835..00000000
--- a/katello/hooks/boot/30-upgrade.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-app_option(
-  '--upgrade',
-  :flag,
-  "Deprecated. The installer will ensure the right state in all cases now. This flag will be removed in a future release.",
-  :default => false
-)
diff --git a/katello/hooks/pre_validations/29-upgrade.rb b/katello/hooks/pre_validations/29-upgrade.rb
deleted file mode 100644
index 9c3ad3d4..00000000
--- a/katello/hooks/pre_validations/29-upgrade.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-if app_value(:upgrade)
-  log_and_say(:warn, 'The --upgrade option has been removed. The installer will ensure the system is in the right state. The use of --upgrade is no longer needed.')
-end