rpms/subscription-manager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

1713109: fix the install class problem in one more place

Browse Source
This commit is contained in:
Adam Williamson 2019-06-03 11:41:04 -07:00
parent 9abe4f7f8d
commit 8ad3358c57
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-Also-handle-anaconda-removal-of-install-classes-in-r.patch Normal file
View File

@ -0,0 +1,39 @@
From c3a5563c75827aeb40c00bd4976103729154434b Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 3 Jun 2019 11:33:44 -0700
Subject: [PATCH] Also handle anaconda removal of install classes in
rhsm_gui.py
Fix one more remaining place where we were affected by anaconda
removing install classes. As with the earlier fixes to rhsm_ks,
handle both old and new anaconda so we can work with either.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
.../gui/spokes/rhsm_gui.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/initial-setup/com_redhat_subscription_manager/gui/spokes/rhsm_gui.py b/src/initial-setup/com_redhat_subscription_manager/gui/spokes/rhsm_gui.py
index 20c7a4a5..8f1307b2 100644
--- a/src/initial-setup/com_redhat_subscription_manager/gui/spokes/rhsm_gui.py
+++ b/src/initial-setup/com_redhat_subscription_manager/gui/spokes/rhsm_gui.py
@@ -80,8 +80,14 @@ class RHSMSpoke(NormalSpoke):
"""Run this spoke for Anaconda and InitialSetup"""
return True
- def __init__(self, data, storage, payload, instclass):
- NormalSpoke.__init__(self, data, storage, payload, instclass)
+ def __init__(self, data, storage, payload, instclass=None):
+ # Before 78fd1e82 , anaconda passes us instclass, and
+ # NormalSpoke accepts it. After 78fd1e82, it doesn't. So we
+ # handle both cases.
+ if instclass:
+ NormalSpoke.__init__(self, data, storage, payload, instclass)
+ else:
+ NormalSpoke.__init__(self, data, storage, payload)
self._done = False
self._addon_data = self.data.addons.com_redhat_subscription_manager
--
2.21.0

7
subscription-manager.spec
View File

@ -139,7 +139,7 @@
Name: subscription-manager
Version: 1.25.5
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Tools and libraries for subscription and repository management
Group: System Environment/Base
License: GPLv2
@ -160,9 +160,11 @@ Source1: %{name}-cockpit-%{version}.tar.gz
Source2: subscription-manager-rpmlintrc
%endif
# https://github.com/candlepin/subscription-manager/pull/2092
# https://github.com/candlepin/subscription-manager/pull/2102
# Fix the initial-setup addon for anaconda > 30
# https://bugzilla.redhat.com/show_bug.cgi?id=1713109
Patch0: 0001-Anaconda-addon-setup-and-execute-no-longer-get-instc.patch
Patch1: 0001-Also-handle-anaconda-removal-of-install-classes-in-r.patch
%if (0%{?suse_version} && 0%{?suse_version} < 1200)
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -1170,6 +1172,9 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
* Mon Jun 03 2019 Adam Williamson <awilliam@redhat.com> - 1.25.5-3
- 1713109: fix the install class problem in one more place
* Fri May 24 2019 Adam Williamson <awilliam@redhat.com> - 1.25.5-2
- 1713109: fix the initial-setup addon for anaconda >= 30