summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorStanislav Laznicka <slaznick@redhat.com>2016-02-02 12:57:11 +0100
committerJan Cholasta <jcholast@redhat.com>2016-02-24 09:21:30 +0100
commitd7efd8a33ab14a561d3af445e62bceb6f2f13fd1 (patch)
tree2f03d17484383bc4114fff16cc9a5f56883e6752 /ipapython
parent9757384c7c6337138b6e096d3bb926cdb3012ff6 (diff)
downloadfreeipa-d7efd8a33ab14a561d3af445e62bceb6f2f13fd1.tar.gz
freeipa-d7efd8a33ab14a561d3af445e62bceb6f2f13fd1.tar.xz
freeipa-d7efd8a33ab14a561d3af445e62bceb6f2f13fd1.zip
Fixes minor issues
Fixes issues discovered by Coverity plugins/baseldap.py: possible undefined value in return certmonger.py: possible dereference of None value i18n.py: fixed always True bug (+ cosmetic change) https://fedorahosted.org/freeipa/ticket/5661 Reviewed-By: Jan Cholasta <jcholast@redhat.com> Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/certmonger.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/ipapython/certmonger.py b/ipapython/certmonger.py
index f89ca0b7a..effb7bb15 100644
--- a/ipapython/certmonger.py
+++ b/ipapython/certmonger.py
@@ -318,8 +318,11 @@ def request_cert(nssdb, nickname, subject, principal, passwd_fname=None):
if result[0]:
request = _cm_dbus_object(cm.bus, cm, result[1], DBUS_CM_REQUEST_IF,
DBUS_CM_IF, True)
- except TypeError:
- root_logger.error('Failed to get create new request.')
+ else:
+ raise RuntimeError('add_request() returned False')
+ except Exception as e:
+ root_logger.error('Failed to create a new request: {error}'
+ .format(error=e))
raise
return request.obj_if.get_nickname()
@@ -356,8 +359,11 @@ def start_tracking(nickname, secdir, password_file=None, command=None):
if result[0]:
request = _cm_dbus_object(cm.bus, cm, result[1], DBUS_CM_REQUEST_IF,
DBUS_CM_IF, True)
- except TypeError as e:
- root_logger.error('Failed to add new request.')
+ else:
+ raise RuntimeError('add_request() returned False')
+ except Exception as e:
+ root_logger.error('Failed to add new request: {error}'
+ .format(error=e))
raise
return request.prop_if.Get(DBUS_CM_REQUEST_IF, 'nickname')