Improve ContainerError message compute

Signed-off-by: Joffrey F <[email protected]>
Lxtluck · Aug 17, 2017 · f337495 · f337495
1 parent 62fda98
commit f337495
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/docker/errors.py b/docker/errors.py
@@ -128,12 +128,9 @@ def __init__(self, container, exit_status, command, image, stderr):
         self.image = image
         self.stderr = stderr
 
-        if stderr is None:
-            msg = ("Command '{}' in image '{}' returned non-zero exit "
-                   "status {}").format(command, image, exit_status, stderr)
-        else:
-            msg = ("Command '{}' in image '{}' returned non-zero exit "
-                   "status {}: {}").format(command, image, exit_status, stderr)
+        err = ": {}".format(stderr) if stderr is not None else ""
+        msg = ("Command '{}' in image '{}' returned non-zero exit "
+               "status {}{}").format(command, image, exit_status, err)
 
         super(ContainerError, self).__init__(msg)