Update patch for a9-beta
This commit is contained in:
parent
f6d57b412b
commit
10634e1a33
@ -1,17 +1,6 @@
|
|||||||
diff -aruN subscription-manager-1.28.29/etc-conf/rhsm-icon.desktop.in subscription-manager-1.28.29.alma/etc-conf/rhsm-icon.desktop.in
|
diff -Naur subscription-manager-1.27.18.orig/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-cockpit.desktop.in
|
||||||
--- subscription-manager-1.28.29/etc-conf/rhsm-icon.desktop.in 2022-04-13 18:01:03.000000000 +0300
|
--- subscription-manager-1.27.18.orig/etc-conf/subscription-manager-cockpit.desktop.in 2021-02-18 05:55:39.035895432 +0300
|
||||||
+++ subscription-manager-1.28.29.alma/etc-conf/rhsm-icon.desktop.in 2022-05-10 19:54:31.000000000 +0300
|
+++ subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-cockpit.desktop.in 2021-03-24 00:43:45.609663355 +0300
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
|
|
||||||
[Desktop Entry]
|
|
||||||
-_Name=Red Hat Subscription Validity Applet
|
|
||||||
+_Name=Subscription Validity Applet
|
|
||||||
Icon=subscription-manager
|
|
||||||
Exec=rhsm-icon
|
|
||||||
Terminal=false
|
|
||||||
diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in
|
|
||||||
--- subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in 2022-04-13 18:01:03.000000000 +0300
|
|
||||||
+++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in 2022-05-10 19:54:57.000000000 +0300
|
|
||||||
@@ -1,5 +1,5 @@
|
@@ -1,5 +1,5 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
-_Name=Red Hat Subscription Manager
|
-_Name=Red Hat Subscription Manager
|
||||||
@ -19,32 +8,9 @@ diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.de
|
|||||||
Icon=subscription-manager
|
Icon=subscription-manager
|
||||||
Type=Application
|
Type=Application
|
||||||
TryExec=/usr/libexec/cockpit-desktop
|
TryExec=/usr/libexec/cockpit-desktop
|
||||||
diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-gui.desktop.in subscription-manager-1.28.29.alma/etc-conf/subscription-manager-gui.desktop.in
|
diff -Naur subscription-manager-1.27.18.orig/src/subscription_manager/repolib.py subscription-manager-1.27.18.debrand/src/subscription_manager/repolib.py
|
||||||
--- subscription-manager-1.28.29/etc-conf/subscription-manager-gui.desktop.in 2022-04-13 18:01:03.000000000 +0300
|
--- subscription-manager-1.27.18.orig/src/subscription_manager/repolib.py 2021-02-18 05:55:38.973062531 +0300
|
||||||
+++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-gui.desktop.in 2022-05-10 19:55:18.000000000 +0300
|
+++ subscription-manager-1.27.18.debrand/src/subscription_manager/repolib.py 2021-03-24 00:44:17.617615991 +0300
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
[Desktop Entry]
|
|
||||||
-_Name=Red Hat Subscription Manager
|
|
||||||
+_Name=Subscription Manager
|
|
||||||
Icon=subscription-manager
|
|
||||||
Exec=subscription-manager-gui
|
|
||||||
Terminal=false
|
|
||||||
diff -aruN subscription-manager-1.28.29/src/subscription_manager/migrate/migrate.py subscription-manager-1.28.29.alma/src/subscription_manager/migrate/migrate.py
|
|
||||||
--- subscription-manager-1.28.29/src/subscription_manager/migrate/migrate.py 2022-04-13 18:01:03.000000000 +0300
|
|
||||||
+++ subscription-manager-1.28.29.alma/src/subscription_manager/migrate/migrate.py 2022-05-10 19:59:46.000000000 +0300
|
|
||||||
@@ -278,8 +278,7 @@
|
|
||||||
if self.options.five_to_six:
|
|
||||||
msgs = [_("This system appears to already be registered to Satellite 6.")]
|
|
||||||
else:
|
|
||||||
- msgs = [_("This system appears to already be registered to Red Hat Subscription Management.")]
|
|
||||||
- msgs.append(_("Please visit https://access.redhat.com/management/consumers/%s to view the profile details.") % identity.uuid)
|
|
||||||
+ msgs = [_("This system appears to already be registered to Subscription Management.")]
|
|
||||||
system_exit(1, msgs)
|
|
||||||
|
|
||||||
try:
|
|
||||||
diff -aruN subscription-manager-1.28.29/src/subscription_manager/repolib.py subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py
|
|
||||||
--- subscription-manager-1.28.29/src/subscription_manager/repolib.py 2022-04-13 18:01:03.000000000 +0300
|
|
||||||
+++ subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py 2022-05-10 20:01:44.000000000 +0300
|
|
||||||
@@ -87,7 +87,7 @@
|
@@ -87,7 +87,7 @@
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def warning_message(enabled_yum_plugins):
|
def warning_message(enabled_yum_plugins):
|
||||||
|
Loading…
Reference in New Issue
Block a user