Blame SOURCES/rhnlib-2.5.65-1-to-rhnlib-2.5.65-2-el7.patch

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