]> Frank Brehm's Git Trees - pixelpark/create-terraform.git/commitdiff
Fixing error output in lib/cr_tf/handler.py
authorFrank Brehm <frank.brehm@pixelpark.com>
Tue, 5 Nov 2019 16:05:01 +0000 (17:05 +0100)
committerFrank Brehm <frank.brehm@pixelpark.com>
Tue, 5 Nov 2019 16:05:01 +0000 (17:05 +0100)
lib/cr_tf/handler.py

index 1989f01d4bf6b2a22e0ef4037405efbc006dc5d0..25bc2940a6f40e629abe9afd49f43906e8c63b59 100644 (file)
@@ -620,17 +620,11 @@ class CreateTerraformHandler(BaseHandler):
                 found_vspheres.append(vname)
         if len(found_vspheres) > 1:
             yaml_file_rel = os.path.relpath(str(yaml_file), os.getcwd())
-            msg = _(
-                "There is only one, unique VSPhere definition allowed in a project file. "
-                "In {f!r} were found {nr} different VSPhere definitions:").format(
+            msg = _("There is only one, unique VSPhere definition allowed in a project file.") + '\n'
+            msg += _("In {f!r} were found {nr} different VSPhere definitions:").format(
                 f=yaml_file_rel, nr=len(found_vspheres))
-            msg += '\n'
-            first_one = True
             for vname in sorted(found_vspheres, key=str.lower):
-                if not first_one:
-                    msg += '\n'
-                first_one = False
-                msg += ' * {!r}'.format(vname)
+                msg += '\n * {!r}'.format(vname)
             raise ExpectedHandlerError(msg)
 
         self._init_vspheres()