Fix multiple substitutions replace

dolfinus · Sep 21, 2021 · 9ca6740 · 9ca6740
1 parent 2903a24
commit 9ca6740
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/setuptools_git_versioning.py b/setuptools_git_versioning.py
@@ -142,9 +142,9 @@ def subst_env_variables(template):  # type: (str) -> str
             value = os.environ.get(var)
 
             if value:
-                template = ENV_VARS_REGEXP.sub(value, template)
+                template, _ = ENV_VARS_REGEXP.subn(value, template, count=1)
             else:
-                template = ENV_VARS_REGEXP.sub("{" + (default or "UNKNOWN") + "}", template)
+                template, _ = ENV_VARS_REGEXP.subn("{" + (default or "UNKNOWN") + "}", template, count=1)
 
     return template
 
@@ -153,8 +153,8 @@ def subst_timestamp(template):  # type: (str) -> str
     if "{timestamp" in template:
         now = datetime.now()
         for fmt in TIMESTAMP_REGEXP.findall(template):
-            result = now.strftime(fmt)
-            template = TIMESTAMP_REGEXP.sub(result, template)
+            result = now.strftime(fmt or "%s")
+            template, _ = TIMESTAMP_REGEXP.subn(result, template, count=1)
 
     return template