From 8fddbe2b09f4dc1b5edee792a0a42eac71b50d45 Mon Sep 17 00:00:00 2001
From: dbeltran <daniel.beltran@bsc.es>
Date: Mon, 20 Nov 2023 12:20:37 +0100
Subject: [PATCH 1/2] Fixes #1158

---
 autosubmit/job/job.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/autosubmit/job/job.py b/autosubmit/job/job.py
index 0527bf755..ce5b8fbe5 100644
--- a/autosubmit/job/job.py
+++ b/autosubmit/job/job.py
@@ -1934,20 +1934,21 @@ class Job(object):
         #enumerate and get value
         #TODO regresion test
         for additional_file, additional_template_content in zip(self.additional_files, additional_templates):
-            for key, value in parameters.items():
-                final_sub = str(value)
-                if "\\" in final_sub:
-                    final_sub = re.escape(final_sub)
-                # Check if key is in the additional template
-                if "%(?<!%%)" + key + "%(?!%%)" in additional_template_content:
-                    additional_template_content = re.sub('%(?<!%%)' + key + '%(?!%%)', final_sub, additional_template_content,flags=re.I)
-            for variable in self.undefined_variables:
-                additional_template_content = re.sub('%(?<!%%)' + variable + '%(?!%%)', '', additional_template_content,flags=re.I)
-
+            # append to a list all names don't matter the location, inside additional_template_content that  starts with % and ends with %
+            placeholders_inside_additional_template = re.findall('%(?<!%%)[a-zA-Z0-9_.]+%(?!%%)', additional_template_content,flags=re.IGNORECASE)
+            for placeholder in placeholders_inside_additional_template:
+                placeholder = placeholder[1:-1]
+                value = str(parameters.get(placeholder.upper(),""))
+                if not value:
+                    additional_template_content = re.sub('%(?<!%%)' + placeholder + '%(?!%%)', '',
+                                                         additional_template_content, flags=re.I)
+                else:
+                    if "\\" in value:
+                        value = re.escape(value)
+                    additional_template_content = re.sub('%(?<!%%)' + placeholder + '%(?!%%)', value, additional_template_content,flags=re.I)
             additional_template_content = additional_template_content.replace("%%", "%")
             #Write to file
             try:
-
                 filename = os.path.basename(os.path.splitext(additional_file)[0])
                 full_path = os.path.join(self._tmp_path,filename ) + "_" + self.name[5:]
                 open(full_path, 'wb').write(additional_template_content.encode(lang))
-- 
GitLab


From 5db2b6aaeae0eaf050643b3d7fc710fb46eff5c3 Mon Sep 17 00:00:00 2001
From: dbeltran <daniel.beltran@bsc.es>
Date: Mon, 20 Nov 2023 12:20:52 +0100
Subject: [PATCH 2/2] Fixes #1158

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 874595771..02a0b6a03 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.100
+4.0.101
-- 
GitLab