2 commits - client/rhel rel-eng/packages
Miroslav Suchý
msuchy at fedoraproject.org
Sat Jun 16 16:13:38 UTC 2012
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 0cadcac5e849c7a17dc262d849c1149bfc28749e
Author: Miroslav Suchý <msuchy at redhat.com>
Date: Sat Jun 16 18:13:25 2012 +0200
Automatic commit of package [rhn-client-tools] release [1.8.8-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index c3ef05b..110196c 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.8.7
+Version: 1.8.8
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Sat Jun 16 2012 Miroslav Suchý <msuchy at redhat.com> 1.8.8-1
+- workaround problem on suse and debian where you inherit from two same classes
+
* Sat Jun 16 2012 Miroslav Suchý 1.8.7-1
- allow linking against openssl (msuchy at redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 796619b..eb2e1ed 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.8.7-1 client/rhel/rhn-client-tools/
+1.8.8-1 client/rhel/rhn-client-tools/
commit d9895d3011a5c3fd1a7dd241d7712f2b6f25a873
Author: Miroslav Suchý <msuchy at redhat.com>
Date: Sat Jun 16 18:12:06 2012 +0200
workaround problem on suse and debian where you inherit from two same classes
addressing:
Traceback (most recent call last):
File "/usr/sbin/rhn_register", line 24, in <module>
from up2date_client import up2dateAuth
File "/usr/share/rhn/up2date_client/up2dateAuth.py", line 4, in <module>
import rhnserver
File "/usr/share/rhn/up2date_client/rhnserver.py", line 20, in <module>
import rpcServer
File "/usr/share/rhn/up2date_client/rpcServer.py", line 12, in <module>
import clientCaps
File "/usr/share/rhn/up2date_client/clientCaps.py", line 10, in <module>
from capabilities import parseCap
File "/usr/share/rhn/up2date_client/capabilities.py", line 4, in <module>
import up2dateErrors
File "/usr/share/rhn/up2date_client/up2dateErrors.py", line 188, in <module>
class SSLCertificateVerifyFailedError(RepoError, Error):
TypeError: Error when calling the metaclass bases
duplicate base class Error
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index f55e190..19052ae 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -79,8 +79,11 @@ class Error(YumBaseError):
else:
self.__dict__[name] = value
+class DebAndSuseRepoError(Error):
+ pass
+
if getPlatform() == 'deb' or dist()[0] == 'SuSE':
- RepoError = Error
+ RepoError = DebAndSuseRepoError
else:
from yum.Errors import RepoError
More information about the spacewalk-commits
mailing list