From 8a416ccc5e78474a33b883d9653fea15d07e2b5f Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 26 Jul 2017 16:57:06 -0400 Subject: [PATCH 1/2] Correct mistake in core formatting --- confluent_server/confluent/core.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/confluent_server/confluent/core.py b/confluent_server/confluent/core.py index a6492611..5d074d38 100644 --- a/confluent_server/confluent/core.py +++ b/confluent_server/confluent/core.py @@ -234,12 +234,10 @@ def _init_core(): 'default': 'ipmi', }), 'updates': { - 'active': { - PluginCollection({ + 'active': PluginCollection({ 'pluginattrs': ['hardwaremanagement.method'], 'default': 'ipmi', - }), - }, + }), }, }, }, From 858647bb6d6ec58e8909861a7dd35cec60e032dd Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 27 Jul 2017 09:03:36 -0400 Subject: [PATCH 2/2] Change to str for exception message str will tend to present a more normal looking error string. Use that so that a user does not have the impression there is a code issue on expected errors. --- confluent_server/confluent/firmwaremanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_server/confluent/firmwaremanager.py b/confluent_server/confluent/firmwaremanager.py index 721c6544..25acc280 100644 --- a/confluent_server/confluent/firmwaremanager.py +++ b/confluent_server/confluent/firmwaremanager.py @@ -30,7 +30,7 @@ def execupdate(handler, filename, updateobj): updateobj.handle_progress({'phase': 'complete', 'progress': 100.0}) except Exception as e: updateobj.handle_progress({'phase': 'error', 'progress': 0.0, - 'detail': repr(e)}) + 'detail': str(e)}) class Updater(object): def __init__(self, node, handler, filename, tenant=None, name=None):