57 lines
3.4 KiB
Diff
57 lines
3.4 KiB
Diff
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
|
|
--- subscription-manager-1.28.29/etc-conf/rhsm-icon.desktop.in 2022-04-13 18:01:03.000000000 +0300
|
|
+++ subscription-manager-1.28.29.alma/etc-conf/rhsm-icon.desktop.in 2022-05-10 19:54:31.000000000 +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 @@
|
|
[Desktop Entry]
|
|
-_Name=Red Hat Subscription Manager
|
|
+_Name=Subscription Manager
|
|
Icon=subscription-manager
|
|
Type=Application
|
|
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
|
|
--- subscription-manager-1.28.29/etc-conf/subscription-manager-gui.desktop.in 2022-04-13 18:01:03.000000000 +0300
|
|
+++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-gui.desktop.in 2022-05-10 19:55:18.000000000 +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 @@
|
|
@staticmethod
|
|
def warning_message(enabled_yum_plugins):
|
|
message = _('The yum/dnf plugins: %s were automatically enabled for the benefit of '
|
|
- 'Red Hat Subscription Management. If not desired, use '
|
|
+ 'Subscription Management. If not desired, use '
|
|
'"subscription-manager config --rhsm.auto_enable_yum_plugins=0" to '
|
|
'block this behavior.') % ', '.join(enabled_yum_plugins)
|
|
return message
|