From 12d0fe21cd195506293c19d0b71bf21f079e1046 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 26 Jul 2017 16:37:09 -0400
Subject: [PATCH 1/2] Only show error message when errors exist

---
 confluent_client/bin/nodefirmware | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/confluent_client/bin/nodefirmware b/confluent_client/bin/nodefirmware
index 5efb809f..c5bccdd6 100755
--- a/confluent_client/bin/nodefirmware
+++ b/confluent_client/bin/nodefirmware
@@ -116,7 +116,9 @@ def update_firmware(session, filename):
             output.set_output(node, progress)
         time.sleep(2)
     allerrnodes = ','.join(noderrs)
-    sys.stderr.write('Nodes had errors updating ({0})!\n'.format(allerrnodes))
+    if noderrs:
+        sys.stderr.write(
+            'Nodes had errors updating ({0})!\n'.format(allerrnodes))
     for node in noderrs:
         sys.stderr.write('{0}: {1}\n'.format(node, noderrs[node]))
 

From 8a416ccc5e78474a33b883d9653fea15d07e2b5f Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 26 Jul 2017 16:57:06 -0400
Subject: [PATCH 2/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',
-                        }),
-                    },
+                    }),
                 },
             },
         },