From 35261acfe3779f16fa8957b87b1229c7e0d1ff71 Mon Sep 17 00:00:00 2001
From: dbeltran <daniel.beltran@bsc.es>
Date: Tue, 7 Nov 2023 10:57:16 +0100
Subject: [PATCH 1/3] bug fix an issue with additional_files and \\ variables

---
 autosubmit/job/job.py            | 8 +++++++-
 autosubmit/platforms/platform.py | 5 ++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/autosubmit/job/job.py b/autosubmit/job/job.py
index 75ba6ddcb..211f059af 100644
--- a/autosubmit/job/job.py
+++ b/autosubmit/job/job.py
@@ -1850,7 +1850,13 @@ class Job(object):
 
         for additional_file, additional_template_content in zip(self.additional_files, additional_templates):
             for key, value in parameters.items():
-                additional_template_content = re.sub('%(?<!%%)' + key + '%(?!%%)', str(parameters[key]), additional_template_content,flags=re.I)
+                if "\\" in str(parameters[key]):
+                    final_sub = re.escape(str(parameters[key]))
+                else:
+                    final_sub = str(parameters[key])
+                # 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)
 
diff --git a/autosubmit/platforms/platform.py b/autosubmit/platforms/platform.py
index 95fea2bcd..34293107e 100644
--- a/autosubmit/platforms/platform.py
+++ b/autosubmit/platforms/platform.py
@@ -310,9 +310,8 @@ class Platform(object):
                         raise
                     except Exception as e:
                         self.connected = False
-                        raise AutosubmitError(
-                            "{0} submission failed. May be related to running a job with check=on_submission and another that affect this job template".format(
-                                self.name), 6015, str(e))
+                        message = f'Error In platform {self.name} for section {package.jobs[0].section}: {str(e)}'
+                        raise AutosubmitError(message, 6015)
             except AutosubmitCritical as e:
                 raise AutosubmitCritical(e.message, e.code, e.trace)
             except AutosubmitError as e:
-- 
GitLab


From ec9dde5aaff6c3828e5c9ae92b8cfac71508debd Mon Sep 17 00:00:00 2001
From: dbeltran <daniel.beltran@bsc.es>
Date: Tue, 7 Nov 2023 11:04:06 +0100
Subject: [PATCH 2/3] update version

---
 VERSION          | 2 +-
 requeriments.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index e373cc472..511f5bac1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.98
+4.0.99
diff --git a/requeriments.txt b/requeriments.txt
index 77c7bf345..937b6a284 100644
--- a/requeriments.txt
+++ b/requeriments.txt
@@ -1,6 +1,6 @@
 setuptools>=60.8.2
 cython
-autosubmitconfigparser==1.0.49
+autosubmitconfigparser==1.0.50
 paramiko>=2.9.2
 bcrypt>=3.2
 PyNaCl>=1.5.0
-- 
GitLab


From 306b325dce207eb7647dce2ab2cd5b39528ac53d Mon Sep 17 00:00:00 2001
From: dbeltran <daniel.beltran@bsc.es>
Date: Tue, 7 Nov 2023 11:24:42 +0100
Subject: [PATCH 3/3] revise the changes

---
 autosubmit/job/job.py            | 9 ++++-----
 autosubmit/platforms/platform.py | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/autosubmit/job/job.py b/autosubmit/job/job.py
index 211f059af..43f6b7245 100644
--- a/autosubmit/job/job.py
+++ b/autosubmit/job/job.py
@@ -1847,13 +1847,12 @@ class Job(object):
         parameters = self.parameters
         template_content,additional_templates = self.update_content(as_conf)
         #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():
-                if "\\" in str(parameters[key]):
-                    final_sub = re.escape(str(parameters[key]))
-                else:
-                    final_sub = str(parameters[key])
+                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)
diff --git a/autosubmit/platforms/platform.py b/autosubmit/platforms/platform.py
index 34293107e..10d7e1051 100644
--- a/autosubmit/platforms/platform.py
+++ b/autosubmit/platforms/platform.py
@@ -310,7 +310,7 @@ class Platform(object):
                         raise
                     except Exception as e:
                         self.connected = False
-                        message = f'Error In platform {self.name} for section {package.jobs[0].section}: {str(e)}'
+                        message = f'Error in platform {self.name} for section {package.jobs[0].section}: {str(e)}'
                         raise AutosubmitError(message, 6015)
             except AutosubmitCritical as e:
                 raise AutosubmitCritical(e.message, e.code, e.trace)
-- 
GitLab