From 4efef8be9e30437acf7856350d1444c68df3699d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Caletka?= Date: Mon, 17 Sep 2018 13:48:52 +0200 Subject: [PATCH] Do not template line breaks when header and footer are missing --- dzonegit.py | 6 ++++-- test_dzonegit.py | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dzonegit.py b/dzonegit.py index 9827d85..bc5c2d4 100644 --- a/dzonegit.py +++ b/dzonegit.py @@ -358,7 +358,8 @@ def template_config(checkoutpath, template, blacklist=set(), whitelist=set()): out = list() zones = dict() mapping = {"datetime": datetime.datetime.now().strftime("%c")} - out.append(headertpl.substitute(mapping)) + if headertpl.template: + out.append(headertpl.substitute(mapping)) for f in sorted(Path(checkoutpath).glob("**/*.zone")): zonename = get_zone_name(f, f.read_bytes()) if whitelist and not any( @@ -396,7 +397,8 @@ def template_config(checkoutpath, template, blacklist=set(), whitelist=set()): mapping, zonename=zonename, zonefile=str(f), zonevar=zonevar, )) - out.append(footertpl.substitute(mapping)) + if footertpl.template: + out.append(footertpl.substitute(mapping)) return "\n".join(out) diff --git a/test_dzonegit.py b/test_dzonegit.py index 4f28ad8..58a40c4 100644 --- a/test_dzonegit.py +++ b/test_dzonegit.py @@ -387,6 +387,8 @@ def test_template_config(git_dir): blacklist=set("*"), ) assert " - zone: \"dummy\"\n file: \"" not in output + output = dzonegit.template_config(str(git_dir), "{}") + assert len(output) == 0 def test_load_set_file(git_dir):