]>
Commit | Line | Data |
---|---|---|
5d160f53 WB |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
3 | Date: Thu, 19 Jan 2023 11:13:46 +0100 | |
4 | Subject: [PATCH 2/2] build: tools: keep trailing newline in jinja2 renderer | |
5 | ||
6 | Otherwise /usr/share/lxc/config/common.conf.d/00-lxcfs.conf | |
7 | loses its trailing newline | |
8 | ||
9 | Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
10 | --- | |
11 | tools/meson-render-jinja2.py | 7 ++++++- | |
12 | 1 file changed, 6 insertions(+), 1 deletion(-) | |
13 | ||
14 | diff --git a/tools/meson-render-jinja2.py b/tools/meson-render-jinja2.py | |
15 | index 0f9fc43..c7b6c38 100755 | |
16 | --- a/tools/meson-render-jinja2.py | |
17 | +++ b/tools/meson-render-jinja2.py | |
18 | @@ -23,7 +23,12 @@ def parse_config_h(filename): | |
19 | ||
20 | def render(filename, defines): | |
21 | text = open(filename).read() | |
22 | - template = jinja2.Template(text, trim_blocks=True, undefined=jinja2.StrictUndefined) | |
23 | + template = jinja2.Template( | |
24 | + text, | |
25 | + trim_blocks=True, | |
26 | + keep_trailing_newline=True, | |
27 | + undefined=jinja2.StrictUndefined, | |
28 | + ) | |
29 | return template.render(defines) | |
30 | ||
31 | if __name__ == '__main__': | |
32 | -- | |
33 | 2.30.2 | |
34 |