Update patch for 1.29.21

This commit is contained in:
eabdullin 2022-01-26 13:59:09 +03:00
parent 4cd4d0d266
commit fbd0d39a52
1 changed files with 0 additions and 34 deletions

View File

@ -1,14 +1,3 @@
diff -Naur subscription-manager-1.27.18.orig/etc-conf/rhsm-icon.desktop.in subscription-manager-1.27.18.debrand/etc-conf/rhsm-icon.desktop.in
--- subscription-manager-1.27.18.orig/etc-conf/rhsm-icon.desktop.in 2021-02-18 05:55:39.035895432 +0300
+++ subscription-manager-1.27.18.debrand/etc-conf/rhsm-icon.desktop.in 2021-03-24 00:43:26.233292918 +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 -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.27.18.orig/etc-conf/subscription-manager-cockpit.desktop.in 2021-02-18 05:55:39.035895432 +0300
+++ subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-cockpit.desktop.in 2021-03-24 00:43:45.609663355 +0300
@ -19,29 +8,6 @@ diff -Naur subscription-manager-1.27.18.orig/etc-conf/subscription-manager-cockp
Icon=subscription-manager
Type=Application
Exec=/usr/libexec/cockpit-desktop /cockpit/@localhost/subscriptions/index.html
diff -Naur subscription-manager-1.27.18.orig/etc-conf/subscription-manager-gui.desktop.in subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-gui.desktop.in
--- subscription-manager-1.27.18.orig/etc-conf/subscription-manager-gui.desktop.in 2021-02-18 05:55:39.035895432 +0300
+++ subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-gui.desktop.in 2021-03-24 00:43:16.151860329 +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 -Naur subscription-manager-1.27.18.orig/src/subscription_manager/migrate/migrate.py subscription-manager-1.27.18.debrand/src/subscription_manager/migrate/migrate.py
--- subscription-manager-1.27.18.orig/src/subscription_manager/migrate/migrate.py 2021-02-18 05:55:38.971979206 +0300
+++ subscription-manager-1.27.18.debrand/src/subscription_manager/migrate/migrate.py 2021-03-24 00:45:36.979918648 +0300
@@ -279,8 +279,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 -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.27.18.orig/src/subscription_manager/repolib.py 2021-02-18 05:55:38.973062531 +0300
+++ subscription-manager-1.27.18.debrand/src/subscription_manager/repolib.py 2021-03-24 00:44:17.617615991 +0300