client/rhel/yum-rhn-plugin/rhnplugin.py | 4 +---
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 112d40c860aaddc8456ea4729626a554f0f02c83
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Oct 17 09:11:15 2013 +0200
Automatic commit of package [yum-rhn-plugin] release [2.1.5-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index e1c5ac7..276a22e 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: Spacewalk support for yum
Name: yum-rhn-plugin
-Version: 2.1.4
+Version: 2.1.5
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -70,6 +70,9 @@ fi
%doc LICENSE
%changelog
+* Thu Oct 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.5-1
+- 1018929 - removed redundant exception
+
* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.4-1
- removed trailing whitespaces
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index f880dba..99f4126 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-2.1.4-1 client/rhel/yum-rhn-plugin/
+2.1.5-1 client/rhel/yum-rhn-plugin/
commit 60cf0271cc8a32b709b6f66161938fa03bede4d4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 16 09:41:23 2013 +0200
1018929 - removed redundant exception
both sections just re-raise exception as RepoError
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py
b/client/rhel/yum-rhn-plugin/rhnplugin.py
index 05230ba..3f70d50 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -361,9 +361,7 @@ class RhnRepo(YumRepository):
try:
li = up2dateAuth.getLoginInfo(timeout=self.timeout)
- except up2dateErrors.RhnServerException, e:
- raise yum.Errors.RepoError(unicode(e)), None, sys.exc_info()[2]
- except e:
+ except Exception, e:
raise yum.Errors.RepoError(unicode(e)), None, sys.exc_info()[2]
# TODO: do evalution on li auth times to see if we need to obtain a