From d7d7092b113e4e2c53b111830bd9bb6b2ebd84ad Mon Sep 17 00:00:00 2001 From: dbeltran Date: Thu, 25 Jun 2020 16:50:26 +0200 Subject: [PATCH] Permissions bug fixed --- autosubmit/autosubmit.py | 12 ++++++------ autosubmit/job/job_packager.py | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/autosubmit/autosubmit.py b/autosubmit/autosubmit.py index ba62f7a43..8711afcce 100644 --- a/autosubmit/autosubmit.py +++ b/autosubmit/autosubmit.py @@ -818,7 +818,7 @@ class Autosubmit: exp_id, hpc, Autosubmit.autosubmit_version, dummy) ##### autosubmit_config = AutosubmitConfig( - copy_id, BasicConfig, ConfigParserFactory()) + exp_id, BasicConfig, ConfigParserFactory()) if autosubmit_config.check_conf_files(): project_type = autosubmit_config.get_project_type() if project_type == "git": @@ -865,15 +865,15 @@ class Autosubmit: os.chmod(os.path.join(exp_id_path, "tmp"), 0o755) os.chmod(os.path.join(exp_id_path, "plot"), 0o775) os.chmod(os.path.join(exp_id_path, "conf/autosubmit_" + - str(exp_id) + ".conf"), 0o644) + str(exp_id) + ".conf"), 0o755) os.chmod(os.path.join(exp_id_path, "conf/expdef_" + - str(exp_id) + ".conf"), 0o644) + str(exp_id) + ".conf"), 0o755) os.chmod(os.path.join(exp_id_path, "conf/jobs_" + - str(exp_id) + ".conf"), 0o644) + str(exp_id) + ".conf"), 0o755) os.chmod(os.path.join(exp_id_path, "conf/platforms_" + - str(exp_id) + ".conf"), 0o644) + str(exp_id) + ".conf"), 0o755) os.chmod(os.path.join(exp_id_path, "conf/proj_" + - str(exp_id) + ".conf"), 0o644) + str(exp_id) + ".conf"), 0o755) except: pass return exp_id diff --git a/autosubmit/job/job_packager.py b/autosubmit/job/job_packager.py index 575db7e9e..91f97e090 100644 --- a/autosubmit/job/job_packager.py +++ b/autosubmit/job/job_packager.py @@ -220,7 +220,7 @@ class JobPackager(object): # if the quantity is not enough, don't make the wrapper if len(p.jobs) >= min_wrapped_jobs: built_packages.append(p) - elif self._jobs_list._chunk_list.index(p.jobs[0].chunk) >= len(self._jobs_list._chunk_list) - ( + elif self._jobs_list._chunk_list.index(p.jobs[0].chunk)+1 >= len(self._jobs_list._chunk_list) - ( len(self._jobs_list._chunk_list) % min_wrapped_jobs): # Last case, wrap remaining jobs built_packages.append(p) else: # If a package is discarded, allow to wrap their inner jobs again. @@ -235,7 +235,7 @@ class JobPackager(object): # if the quantity is not enough, don't make the wrapper if len(p.jobs) >= self._as_config.jobs_parser.get_option(section, "MIN_WRAPPED", self._as_config.get_min_wrapped_jobs()): built_packages.append(p) - elif self._jobs_list._member_list.index(p.jobs[0].member) >= len( + elif self._jobs_list._member_list.index(p.jobs[0].member)+1 >= len( self._jobs_list._member_list) - (len(self._jobs_list._member_list) % min_wrapped_jobs): # Last case, wrap remaining jobs built_packages.append(p) else: # If a package is discarded, allow to wrap their inner jobs again. @@ -262,7 +262,6 @@ class JobPackager(object): built_packages = built_packages_tmp self.max_jobs = self.max_jobs - 1 packages_to_submit += built_packages - else: # No wrapper allowed / well-configured for job in jobs_to_submit_by_section[section]: -- GitLab