From fa87937fe94436496812bb4fc002152981814ce7 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Wed, 1 Jun 2016 16:25:40 +0200 Subject: [PATCH] Updated gitlab-conversion.py --- gitlab-conversion.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gitlab-conversion.py b/gitlab-conversion.py index b961736d64..630665f150 100755 --- a/gitlab-conversion.py +++ b/gitlab-conversion.py @@ -23,6 +23,7 @@ def applyTransformation(input): exp = re.compile("[ ]*{% if (.*?) %}(.*?)[ ]*{% endif %}", re.DOTALL) input = re.sub(exp, "ifeval::[{\g<1>}==true]\g<2>endif::[]", input) input = re.sub(r"image:(\.\./)*", "image:", input) + input = re.sub(r"image::(\.\./)*", "image::", input) return input @@ -33,9 +34,13 @@ if len(sys.argv) > 1: if os.path.exists(targetdir): shutil.rmtree(targetdir) -shutil.copytree('images',os.path.join(targetdir, 'images')) -shutil.copytree('keycloak-images',os.path.join(targetdir, 'keycloak-images')) -shutil.copytree('rhsso-images',os.path.join(targetdir, 'rhsso-images')) + +if os.path.isdir('images'): + shutil.copytree('images',os.path.join(targetdir, 'images')) +if os.path.isdir('keycloak-images'): + shutil.copytree('keycloak-images',os.path.join(targetdir, 'keycloak-images')) +if os.path.isdir('rhsso-images'): + shutil.copytree('rhsso-images',os.path.join(targetdir, 'rhsso-images')) tmp = os.path.join(targetdir, 'topics') if not os.path.exists(tmp):