holm/podman-compose
1
0
Fork 0
forked from extern/podman-compose
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix substitution for empty variables

Browse Source
This commit is contained in:
Mohamed Akram 2021-12-29 15:46:45 +04:00 committed by Muayyad Alsadi
parent c50599c0e7
commit 377b5525c9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
podman_compose.py
View File

@ -178,10 +178,10 @@ var_re = re.compile(r"""
(?P<named>[_a-zA-Z][_a-zA-Z0-9]*) |
(?:{
(?P<braced>[_a-zA-Z][_a-zA-Z0-9]*)
(?:
(?::?-(?P<default>[^}]+)) |
(?::?\?(?P<err>[^}]+))
)?
(?:(?P<empty>:)?(?:
(?:-(?P<default>[^}]+)) |
(?:\?(?P<err>[^}]+))
))?
})
)
""", re.VERBOSE)
@ -198,6 +198,8 @@ def rec_subs(value, subs_dict):
return "$"
name = m.group("named") or m.group("braced")
value = subs_dict.get(name)
if value == "" and m.group('empty'):
value = None
if value is not None:
return "%s" % value
if m.group("err") is not None: