client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/jabber_lib.py | 2 +-
rel-eng/packages/osad | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ac135d0ca519d636379690a8329334c56f3351c2
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Nov 11 10:38:24 2013 +0100
Automatic commit of package [osad] release [5.11.32-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 25e6954..c67dc7c 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -17,7 +17,7 @@ Group: System Environment/Daemons
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.11.31
+Version: 5.11.32
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -388,6 +388,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Mon Nov 11 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 5.11.32-1
+- remove extraneous 'except'
+
* Fri Nov 08 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 5.11.31-1
- 917070 - catch jabberd connection errors
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index c26c70c..9355161 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.31-1 client/tools/osad/
+5.11.32-1 client/tools/osad/
commit 28cd10e1004905ccf4ca3a0398d5d2210ef9f7e2
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Nov 11 10:34:33 2013 +0100
remove extraneous 'except'
diff --git a/client/tools/osad/src/jabber_lib.py b/client/tools/osad/src/jabber_lib.py
index b3d5069..9dc6985 100644
--- a/client/tools/osad/src/jabber_lib.py
+++ b/client/tools/osad/src/jabber_lib.py
@@ -566,7 +566,7 @@ class JabberClient(jabber.Client):
for retry in range(0,3):
try:
jabber.Client.connect(self)
- except except socket.error, e:
+ except socket.error, e:
log_error("Error connecting to jabber server: %s" % e)
raise JabberConnectionError(e)