From 37899ad39e0af9fc892f5e0ae8830e0abdfba98e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 5 Nov 2018 10:43:36 -0500 Subject: [PATCH] Do not inject 'None' into builddesc If such data came from remote system, do not cause a stack trace. --- confluent_client/bin/nodefirmware | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/confluent_client/bin/nodefirmware b/confluent_client/bin/nodefirmware index f284dc69..6789c77a 100755 --- a/confluent_client/bin/nodefirmware +++ b/confluent_client/bin/nodefirmware @@ -37,14 +37,14 @@ exitcode = 0 def printfirm(node, prefix, data): - if 'model' in data: + if 'model' in data and data['model']: prefix += ' ' + data['model'] builddesc = [] - if 'build' in data: + if 'build' in data and data['build']: builddesc.append(data['build']) - if 'date' in data: + if 'date' in data and data['date']: builddesc.append(data['date']) - if 'version' in data: + if 'version' in data and data['version']: version = data['version'] if builddesc: version += ' ({0})'.format(' '.join(builddesc))