diff --git a/rhn-client-tools.spec b/rhn-client-tools.spec index 7e4be938fe..ee9ce9785a 100644 --- a/rhn-client-tools.spec +++ b/rhn-client-tools.spec @@ -5,7 +5,7 @@ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar. URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools Version: 2.0.2 -Release: 10%{?dist} +Release: 11%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %if 0%{?suse_version} @@ -361,6 +361,11 @@ make -f Makefile.rhn-client-tools test %endif %changelog +* Mon Apr 24 2017 Tomas Kasparek 2.0.2-11 +- Resolves: #1444764 - sgmlop module might not be available on RHEL 7 + (tkasparek@redhat.com) +- Resolves: #1439139 - fix import error (tkasparek@redhat.com) + * Wed Apr 05 2017 Tomas Kasparek 2.0.2-10 - Resolves: #1439139 - remove malicious import (tkasparek@redhat.com) diff --git a/src/bin/rhn_check.py b/src/bin/rhn_check.py index 191886d0c3..f37d7c8c32 100755 --- a/src/bin/rhn_check.py +++ b/src/bin/rhn_check.py @@ -51,7 +51,6 @@ from up2date_client import rhncli, rhnserver import signal from rhn import SSL from rhn import rhnLockfile -from rhn.tb import raise_with_tb import base64 import time @@ -62,7 +61,8 @@ except ImportError: # python3 import xmlrpc.client as xmlrpclib long = int -del sys.modules['sgmlop'] +if 'sgmlop' in sys.modules: + del sys.modules['sgmlop'] cfg = config.initUp2dateConfig() log = up2dateLog.initLog()