format options only if needed

OSGeo · May 31, 2024 · e2ac8e7 · e2ac8e7
1 parent 834a8cc
commit e2ac8e7
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/gui/wxpython/gmodeler/model.py b/gui/wxpython/gmodeler/model.py
@@ -3600,12 +3600,18 @@ def _getPythonActionCmd(self, item, task, cmdIndent, variables={}):
                     value = 'options["{}"]'.format(self._getParamName(name, item))
                 else:
                     # check for variables
+                    formattedVar = False
                     for var in variables["vars"]:
                         pattern = re.compile("%" + var)
-                        if pattern.search(value):
+                        found = pattern.search(value)
+                        if found:
                             foundVar = True
-                            value = pattern.sub("{options['" + var + "']}", value)
-                    if foundVar:
+                            if found.end() != len(value):
+                                formattedVar = True
+                                value = pattern.sub("{options['" + var + "']}", value)
+                            else:
+                                value = f"options['{var}']"
+                    if formattedVar:
                         value = 'f"' + value + '"'
 
                 if (