|
|
1d9719 |
diff --git a/rhn/connections.py b/rhn/connections.py
|
|
|
f4b68f |
index c237fc4677..d615a8c063 100644
|
|
|
1d9719 |
--- a/rhn/connections.py
|
|
|
1d9719 |
+++ b/rhn/connections.py
|
|
|
1d9719 |
@@ -7,7 +7,7 @@
|
|
|
1d9719 |
|
|
|
1d9719 |
# $Id$
|
|
|
1d9719 |
|
|
|
1d9719 |
-
|
|
|
1d9719 |
+import sys
|
|
|
1d9719 |
import base64
|
|
|
1d9719 |
import SSL
|
|
|
1d9719 |
import nonblocking
|
|
|
1d9719 |
@@ -15,6 +15,7 @@ import httplib
|
|
|
1d9719 |
import xmlrpclib
|
|
|
1d9719 |
import encodings.idna
|
|
|
1d9719 |
import socket
|
|
|
1d9719 |
+import errno
|
|
|
1d9719 |
from platform import python_version
|
|
|
1d9719 |
|
|
|
1d9719 |
# Import into the local namespace some httplib-related names
|
|
|
1d9719 |
@@ -169,16 +170,13 @@ class HTTPSConnection(HTTPConnection):
|
|
|
1d9719 |
af, socktype, proto, canonname, sa = r
|
|
|
1d9719 |
try:
|
|
|
1d9719 |
sock = socket.socket(af, socktype, proto)
|
|
|
1d9719 |
- except socket.error, msg:
|
|
|
1d9719 |
- sock = None
|
|
|
1d9719 |
- continue
|
|
|
1d9719 |
-
|
|
|
1d9719 |
- try:
|
|
|
1d9719 |
sock.connect((self.host, self.port))
|
|
|
1d9719 |
sock.settimeout(self.timeout)
|
|
|
1d9719 |
- except socket.error, e:
|
|
|
1d9719 |
- sock.close()
|
|
|
1d9719 |
- sock = None
|
|
|
1d9719 |
+ except socket.error:
|
|
|
1d9719 |
+ e = sys.exc_info()[1]
|
|
|
1d9719 |
+ if e.errno != errno.EINTR:
|
|
|
1d9719 |
+ sock.close()
|
|
|
1d9719 |
+ sock = None
|
|
|
1d9719 |
continue
|
|
|
1d9719 |
break
|
|
|
1d9719 |
|
|
|
1d9719 |
diff --git a/rhnlib.spec b/rhnlib.spec
|
|
|
f4b68f |
index 1b85fb24fe..8828a35524 100644
|
|
|
1d9719 |
--- a/rhnlib.spec
|
|
|
1d9719 |
+++ b/rhnlib.spec
|
|
|
1d9719 |
@@ -5,7 +5,7 @@ Name: rhnlib
|
|
|
1d9719 |
URL: https://fedorahosted.org/spacewalk
|
|
|
1d9719 |
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
|
|
|
1d9719 |
Version: 2.5.65
|
|
|
1d9719 |
-Release: 1%{?dist}
|
|
|
1d9719 |
+Release: 2%{?dist}
|
|
|
1d9719 |
|
|
|
1d9719 |
Group: Development/Libraries
|
|
|
1d9719 |
License: GPLv2
|
|
|
1d9719 |
@@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
1d9719 |
%{python_sitelib}/*
|
|
|
1d9719 |
|
|
|
1d9719 |
%changelog
|
|
|
1d9719 |
+* Mon Mar 06 2017 Gennadii Altukhov <galt@redhat.com> 2.5.65-2
|
|
|
1d9719 |
+- fix except in rhnlib to make it compatible with Python 2.4 (galt@redhat.com)
|
|
|
1d9719 |
+- 1409577 - Reboot loop - rhn_check, rhnsd (jdostal@redhat.com)
|
|
|
1d9719 |
+
|
|
|
1d9719 |
* Wed Jul 17 2013 Tomas Kasparek <tkasparek@redhat.com> 2.5.65-1
|
|
|
1d9719 |
- updating copyright years
|
|
|
1d9719 |
|