From 18f1c07d654ec5a45ee0680d2e7d3c36b88d2407 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 16 Jul 2018 09:03:02 -0400 Subject: [PATCH] Change to setting an errstr rather than exception If nodefirmware update has an issue, provide error message instead. --- confluent_server/confluent/firmwaremanager.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/confluent_server/confluent/firmwaremanager.py b/confluent_server/confluent/firmwaremanager.py index 13e0c205..62d4933b 100644 --- a/confluent_server/confluent/firmwaremanager.py +++ b/confluent_server/confluent/firmwaremanager.py @@ -31,9 +31,10 @@ updatepool = eventlet.greenpool.GreenPool(256) def execupdate(handler, filename, updateobj, type): if not os.path.exists(filename): - raise exc.InvalidArgumentException( - '{0} does not appear to exist on {1}'.format(filename, - socket.gethostname())) + errstr = '{0} does not appear to exist on {1}'.format( + filename, socket.gethostname()) + updateobj.handle_progress({'phase': 'error', 'progress': 0.0, + 'detail': errstr}) try: if type == 'firmware': completion = handler(filename, progress=updateobj.handle_progress,