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

Update subscription-manager to 1.25.9-1

Browse Source 
Resolves: #1717147 - Updating from System Type to Entitlement Type (waldirio@gmail.com)
Resolves: #1708105 - Fixed unsetting syspurpose attributes; ENT-1330 (jhnidek@redhat.com)
Resolves: #1713626 - Only disable system repos if the disable_system_repos is "1"
Resolves: #1673662 - Print reasons, why syspurpose status is mismatch; ENT-1247
Resolves: #1652549 - Addition of tests for heartbeat method (wpoteat@redhat.com)
Resolves: #1652549 - Connection method for hypervisor heartbeat (wpoteat@redhat.com)
Resolves: #1478892 - Add in a last_boot fact for parity with spacewalk facts
Resolves: #1703607 - Remove productid cert, when it is not needed; ENT-1300
Resolves: #1713626 - Option disable_system_repos didn't work with DNF; ENT-1350
Resolves: #1702239 - Fix traceback for syspurpose on rhel7; ENT-1286 (jhnidek@redhat.com)
Resolves: #1710564 - Make entitlement certs and keys world-readable (csnyder@redhat.com)
Resolves: #1697563 - Suppress output when collecting profile (khowell@redhat.com)
Resolves: #1698443 - Proper callbacks in cert sorter (wpoteat@redhat.com)
Resolves: #1704662 - Do not create corrupted redhat.repo (wrong scheme); ENT-1306
Resolves: #1709728 - Dialog with proxy conf didn't pop-up; ENT-1333 (jhnidek@redhat.com)
Resolves: #1699345 - Do not perform proxy check under some circumstances.
Resolves: #1703768 - Display 'Status Details' correctly in GUI; ENT-1305
Resolves: #1703054 - Do not crash sub-man during unregistering; ENT-1288
This commit is contained in:
Christopher Snyder 2019-06-12 01:58:24 -04:00
parent 6e8af142fe
commit 1b05fd8759
5 changed files with 59 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -97,3 +97,5 @@
/subscription-manager-cockpit-1.24.2.tar.gz
/subscription-manager-1.25.5.tar.gz
/subscription-manager-cockpit-1.25.5.tar.gz
/subscription-manager-1.25.9.tar.gz
/subscription-manager-cockpit-1.25.9.tar.gz

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

@ -1,39 +0,0 @@
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

66
0001-Anaconda-addon-setup-and-execute-no-longer-get-instc.patch
View File

@ -1,66 +0,0 @@
From de4268203e9872d60dd5a99e0db7346568c2b36e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 24 May 2019 12:01:31 -0700
Subject: [PATCH] Anaconda addon: setup() and execute() no longer get instclass
Since anaconda commit
https://github.com/rhinstaller/anaconda/commit/78fd1e82 ,
anaconda addons should no longer expect an install class to be
passed to their setup() and execute() methods. Without this fix,
the addon breaks recent versions of anaconda. As the policy
for this tool seems to be that the most recent version is sent
to all Fedora releases (and RHEL releases?), I implemented this
in such a way that it will work with both old and new anaconda.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1713109
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
.../ks/rhsm_ks.py | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/initial-setup/com_redhat_subscription_manager/ks/rhsm_ks.py b/src/initial-setup/com_redhat_subscription_manager/ks/rhsm_ks.py
index 0d5724b0..f7cf8392 100644
--- a/src/initial-setup/com_redhat_subscription_manager/ks/rhsm_ks.py
+++ b/src/initial-setup/com_redhat_subscription_manager/ks/rhsm_ks.py
@@ -147,21 +147,35 @@ class RHSMAddonData(AddonData):
def __str__(self):
return "%%addon %s %s\n%s%%end\n" % (self.name, self.header_args, self.content)
- def setup(self, storage, ksdata, instclass, payload):
+ def setup(self, *args, **kwargs):
"""Make the changes to the install system.
This method is called before the installation
is started and directly from spokes. It must be possible
to call it multiple times without breaking the environment."""
+ # we use the signature we do because anaconda before commit
+ # 78fd1e82 passes (storage, ksdata, instClass, payload)
+ # but anaconda after 78fd1e82 passes only
+ # (storage, ksdata, payload). If this method *did*
+ # anything we would have to figure out which args we'd got and
+ # handle them appropriately, but since it does nothing, we
+ # don't have to bother with that.
pass
- def execute(self, storage, ksdata, instClass, users, payload):
+ def execute(self, *args, **kwargs):
"""Make the changes to the underlying system.
This method is called only once in the post-install
setup phase.
"""
+ # we use the signature we do because anaconda before commit
+ # 78fd1e82 passes (storage, ksdata, instClass, users, payload)
+ # but anaconda after 78fd1e82 passes only
+ # (storage, ksdata, users, payload). If this method *did*
+ # anything we would have to figure out which args we'd got and
+ # handle them appropriately, but since it does nothing, we
+ # don't have to bother with that.
log.debug("Read RHSM ks info, but non gui ks is currently not implemented.")
def handle_header(self, lineno, args):
--
2.21.0

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (subscription-manager-1.25.5.tar.gz) = 674f721df5924f19741a7cd6a5160443a6ff1d5e53da69aaded030c0457b2a60e727f5ea8858e887f028c08641f0a6345ddb3ef7c2dbd9cb87d201aaa6ebfbc9
SHA512 (subscription-manager-cockpit-1.25.5.tar.gz) = 6380ba102bd9f4766a879909b3816e735d466517e45e2bdb0ae323ea8e6946a736be49bbb48a92b000f1c0d1e93c8b9113e8bf3f0f142f5071dce6b5de026660
SHA512 (subscription-manager-1.25.9.tar.gz) = eff25987c98c7bd2e2ba8d29f3700e3ab62045e96f7432cacc543c088eba9d6b36d7c21bb2ebce139a77666e5507351d30f3babde42461427c37d77727e68bd5
SHA512 (subscription-manager-cockpit-1.25.9.tar.gz) = da0a4c8f2f879dbb2c162f53b472a4ff1eabad2a23940e1fd24ba25891d0ebba404add05642ca0207bd8e86392f9deb4f5cc6326b5749034e318dac6a29356c2

71
subscription-manager.spec
View File

@ -138,8 +138,8 @@
%global subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}"
Name: subscription-manager
Version: 1.25.5
Release: 4%{?dist}
Version: 1.25.9
Release: 1%{?dist}
Summary: Tools and libraries for subscription and repository management
Group: System Environment/Base
License: GPLv2
@ -159,12 +159,6 @@ Source1: %{name}-cockpit-%{version}.tar.gz
%if 0%{?suse_version}
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)
@ -536,8 +530,6 @@ Subscription Manager Cockpit UI
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
@ -1173,14 +1165,61 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
* Tue Jun 04 2019 Adam Williamson <awilliam@redhat.com> - 1.25.5-4
- 1713109: actually apply to patch from -3...
* Wed Jun 12 2019 Christopher Snyder <csnyder@redhat.com> 1.25.9-1
- 1717147: Updating from System Type to Entitlement Type (waldirio@gmail.com)
- Updated from System Type to Entitlement Type (waldirio@gmail.com)
- 1708105: Fixed unsetting syspurpose attributes; ENT-1330 (jhnidek@redhat.com)
- spec: Don't supplement initial-setup-gui on Fedora (awilliam@redhat.com)
- 1713626: Only disable system repos if the disable_system_repos is "1"
(csnyder@redhat.com)
- 1673662: Print reasons, why syspurpose status is mismatch; ENT-1247
(jhnidek@redhat.com)
- Bump sshpk from 1.13.1 to 1.16.1 in /cockpit
(dependabot[bot]@users.noreply.github.com)
- Also handle anaconda removal of install classes in rhsm_gui.py
(awilliam@redhat.com)
- 1652549: Addition of tests for heartbeat method (wpoteat@redhat.com)
- Try to fix ostree unit test. (jhnidek@redhat.com)
- Set LANG to run subscription-manager and get proper output (suttner@atix.de)
* Mon Jun 03 2019 Adam Williamson <awilliam@redhat.com> - 1.25.5-3
- 1713109: fix the install class problem in one more place
* Mon Jun 03 2019 Christopher Snyder <csnyder@redhat.com> 1.25.8-1
- Revert "1621275: Less communication with candlepin server from sub-man
plugin; ENT-923" (csnyder@redhat.com)
- Revert "1700445: Do not disabled repos in redhat.repo; ENT-1261"
(cnsnyder@users.noreply.github.com)
* Fri May 24 2019 Adam Williamson <awilliam@redhat.com> - 1.25.5-2
- 1713109: fix the initial-setup addon for anaconda >= 30
* Mon Jun 03 2019 Christopher Snyder <csnyder@redhat.com> 1.25.7-1
- 1652549: Connection method for hypervisor heartbeat (wpoteat@redhat.com)
- Report insights id as fact, when insights is installed; ENT-1356
(jhnidek@redhat.com)
- Anaconda addon: setup() and execute() no longer get instclass
(awilliam@redhat.com)
- 1478892: Add in a last_boot fact for parity with spacewalk facts
(bryan.kearney@gmail.com)
- 1703607: Remove productid cert, when it is not needed; ENT-1300
(jhnidek@redhat.com)
- Bump tar from 2.2.1 to 2.2.2 in /cockpit
(dependabot[bot]@users.noreply.github.com)
- 1713626: Option disable_system_repos didn't work with DNF; ENT-1350
(jhnidek@redhat.com)
- Modify Vagrantfile to force qemu:///system (khowell@redhat.com)
- 1702239: Fix traceback for syspurpose on rhel7; ENT-1286 (jhnidek@redhat.com)
* Mon May 20 2019 Christopher Snyder <csnyder@redhat.com> 1.25.6-1
- 1710564: Make entitlement certs and keys world-readable (csnyder@redhat.com)
- 1697563: Suppress output when collecting profile (khowell@redhat.com)
- Updated documentation about libdnf (testing section). (jhnidek@redhat.com)
- 1698443: Proper callbacks in cert sorter (wpoteat@redhat.com)
- 1704662: Do not create corrupted redhat.repo (wrong scheme); ENT-1306
(jhnidek@redhat.com)
- 1709728: Dialog with proxy conf didn't pop-up; ENT-1333 (jhnidek@redhat.com)
- 1699345: Do not perform proxy check under some circumstances.
(awood@redhat.com)
- 1703768: Display 'Status Details' correctly in GUI; ENT-1305
(jhnidek@redhat.com)
- Update Fedora releases (wpoteat@redhat.com)
- 1703054: Do not crash sub-man during unregistering; ENT-1288
(jhnidek@redhat.com)
* Tue May 07 2019 Christopher Snyder <csnyder@redhat.com> 1.25.5-1
- 1700445: Do not disabled repos in redhat.repo; ENT-1261 (jhnidek@redhat.com)