Fix CommandFailedError when node is None

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/exceptions.py b/teuthology/exceptions.py
index efc8e71f849077a5e26dd876ac23454be32a5851..9034d5fadb2e02ddf62c801d3657a6b53e43db62 100644 (file)
--- a/teuthology/exceptions.py
+++ b/teuthology/exceptions.py
@@ -42,9 +42,10 @@ class CommandFailedError(Exception):
     def __str__(self):
         prefix = "Command failed"
         if self.label:
-            prefix = "Command failed ({label})".format(label=self.label)
-        return "{prefix} on {node} with status {status}: {cmd!r}".format(
-            node=self.node,
+            prefix += " ({label})".format(label=self.label)
+        if self.node:
+            prefix += " on {node}".format(node=self.node)
+        return "{prefix} with status {status}: {cmd!r}".format(
             status=self.exitstatus,
             cmd=self.command,
             prefix=prefix,