Ordering processing for volume ID substitutions

Related: https://pagure.io/pungi/issue/840

Signed-off-by: Ondrej Nosek <onosek@redhat.com>
This commit is contained in:
Ondrej Nosek 2018-02-22 16:46:58 +01:00
parent 7ee920a085
commit caed78e11a
2 changed files with 25 additions and 1 deletions

View file

@ -322,7 +322,10 @@ def get_variant_data(conf, var_name, variant, keys=None):
def _apply_substitutions(compose, volid):
for k, v in compose.conf['volume_id_substitutions'].items():
substitutions = compose.conf['volume_id_substitutions'].items()
# processing should start with the longest pattern, otherwise, we could
# unexpectedly replace a substring of that longest pattern
for k, v in sorted(substitutions, reverse=True):
volid = volid.replace(k, v)
return volid