proxy/proxy/broker/rhnBroker.py | 4 ++--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit a39937a9fc2bc558014f1c46897fd397101ff69a
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Aug 23 16:24:16 2013 -0400
Automatic commit of package [spacewalk-proxy] release [2.1.5-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 66884e4..3fb3427 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.1.4
+Version: 2.1.5
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -330,6 +330,9 @@ fi
%changelog
+* Fri Aug 23 2013 Stephen Herr <sherr(a)redhat.com> 2.1.5-1
+- 1000586 - pylint errors
+
* Fri Aug 23 2013 Stephen Herr <sherr(a)redhat.com> 2.1.4-1
- 1000586 - fix checkstyle errors
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index d95690e..5c6d418 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-2.1.4-1 proxy/proxy/
+2.1.5-1 proxy/proxy/
commit e3b3bf74c9cee069c75231ddfd9f9f27cb2a7858
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Aug 23 16:24:10 2013 -0400
1000586 - pylint errors
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index 507ec8e..7477252 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -76,7 +76,7 @@ class BrokerHandler(SharedHandler):
# entry on the client or the hostname of some other
# machine (say a load balancer)) then use it
hostname = req.headers_in['Host']
- except Exception:
+ except (socket.gaierror, socket.error, socket.herror, socket.timeout):
# hostname probably didn't exist, fine
pass
if not hostname:
@@ -84,7 +84,7 @@ class BrokerHandler(SharedHandler):
# ip address
try:
hostname = socket.gethostbyaddr(my_ip_addr)[0]
- except Exception:
+ except (socket.gaierror, socket.error, socket.herror, socket.timeout):
# unknown host, we don't have a hostname?
pass
if not hostname: