From 4403a7e4a128afc83f7d8d0e9f5d2a8b2b775f65 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 5 Nov 2019 17:01:44 +0100 Subject: [PATCH] Fixing error output in lib/cr_tf/handler.py --- lib/cr_tf/handler.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/cr_tf/handler.py b/lib/cr_tf/handler.py index 8e3fbb2..1989f01 100644 --- a/lib/cr_tf/handler.py +++ b/lib/cr_tf/handler.py @@ -61,7 +61,7 @@ from .terraform.disk import TerraformDisk from .xlate import XLATOR -__version__ = '3.0.3' +__version__ = '3.0.4' LOG = logging.getLogger(__name__) _ = XLATOR.gettext @@ -619,12 +619,17 @@ class CreateTerraformHandler(BaseHandler): if vname not in found_vspheres: 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( - f=yaml_file, nr=len(found_vspheres)) + 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) raise ExpectedHandlerError(msg) -- 2.39.5