From c92e9a5ca18b198fa34f8bf9c6292b42fbb73f0f Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 12 Oct 2021 10:56:58 +0200
Subject: [PATCH] galaxyfy: Fix roles after vars
If roles have been used after vars, the name of the role was not changed
as the "vars:" section was turning off changeable. A "roles:" section is
now turning on changeable.
---
utils/galaxyfy.py | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/utils/galaxyfy.py b/utils/galaxyfy.py
index 57c0823e..a0f0226f 100644
--- a/utils/galaxyfy.py
+++ b/utils/galaxyfy.py
@@ -24,8 +24,8 @@ import re
def galaxyfy_playbook(project_prefix, collection_prefix, lines):
- p1 = re.compile('(%s.*:)$' % project_prefix)
- p2 = re.compile('(.*:) (%s.*)$' % project_prefix)
+ po1 = re.compile('(%s.*:)$' % project_prefix)
+ po2 = re.compile('(.*:) (%s.*)$' % project_prefix)
out_lines = []
pattern1 = r'%s.\1' % collection_prefix
@@ -35,30 +35,34 @@ def galaxyfy_playbook(project_prefix, collection_prefix, lines):
changeable = False
include_role = False
for line in lines:
- stripped = line.strip()
+ line = line.rstrip()
+ stripped = line.lstrip()
if stripped.startswith("- name:") or \
stripped.startswith("- block:"):
changeable = True
elif stripped in ["set_fact:", "vars:"]:
changeable = False
include_role = False
+ elif stripped == "roles:":
+ changeable = True
+ include_role = False
elif stripped.startswith("include_role:"):
include_role = True
elif include_role and stripped.startswith("name:"):
- line = p2.sub(pattern2, line)
+ line = po2.sub(pattern2, line)
changed = True
elif changeable and stripped.startswith("- role:"):
- line = p2.sub(pattern2, line)
+ line = po2.sub(pattern2, line)
changed = True
- elif (changeable and stripped.startswith(project_prefix) and
- not stripped.startswith(collection_prefix) and
- stripped.endswith(":")):
- line = p1.sub(pattern1, line)
+ elif (changeable and stripped.startswith(project_prefix)
+ and not stripped.startswith(collection_prefix) # noqa
+ and stripped.endswith(":")): # noqa
+ line = po1.sub(pattern1, line)
changed = True
changeable = False # Only change first line in task
- elif (stripped.startswith("- %s" % project_prefix) and
- stripped.endswith(":")):
- line = p1.sub(pattern1, line)
+ elif (stripped.startswith("- %s" % project_prefix)
+ and stripped.endswith(":")): # noqa
+ line = po1.sub(pattern1, line)
changed = True
out_lines.append(line)
--
GitLab