From bb6d547d3f3704047ff579262d3143d889f1cf06 Mon Sep 17 00:00:00 2001 From: Alex Iribarren <Alex.Iribarren@cern.ch> Date: Mon, 18 Oct 2021 16:34:05 +0200 Subject: [PATCH 1/3] Stop yaml loader warning --- generateJobs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generateJobs.py b/generateJobs.py index 4ab6c4f..3105e11 100755 --- a/generateJobs.py +++ b/generateJobs.py @@ -35,7 +35,7 @@ if not yumdir_name: sys.exit(1) with open(config_name, 'r') as configfile: - config = yaml.load(configfile) + config = yaml.load(configfile, Loader=yaml.FullLoader) with open(template_name, 'r') as templatefile: template = Template(templatefile.read()) -- GitLab From 0e8bb7c789a1b3e932f69c393dd3e9d8564a2c55 Mon Sep 17 00:00:00 2001 From: Alex Iribarren <Alex.Iribarren@cern.ch> Date: Mon, 18 Oct 2021 16:35:13 +0200 Subject: [PATCH 2/3] Convert None to an empty string so they don't create weird path mirrors --- generateJobs.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/generateJobs.py b/generateJobs.py index 3105e11..3adb88c 100755 --- a/generateJobs.py +++ b/generateJobs.py @@ -106,6 +106,9 @@ for repofile in os.listdir(yumdir_name): url = repoconfig[rid]['baseurl'] + if url == 'None': + url = '' + path = url.split(PATHCUT)[-1].lstrip('/') if PATHROOT: path = os.path.join(PATHROOT.strip('/'), path) -- GitLab From 9651950c77c158b2baa3d94e77eab9458e647f51 Mon Sep 17 00:00:00 2001 From: Alex Iribarren <Alex.Iribarren@cern.ch> Date: Mon, 18 Oct 2021 17:22:32 +0200 Subject: [PATCH 3/3] Revert "Stop yaml loader warning" This reverts commit bb6d547d3f3704047ff579262d3143d889f1cf06. --- generateJobs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generateJobs.py b/generateJobs.py index 3adb88c..c5b11f9 100755 --- a/generateJobs.py +++ b/generateJobs.py @@ -35,7 +35,7 @@ if not yumdir_name: sys.exit(1) with open(config_name, 'r') as configfile: - config = yaml.load(configfile, Loader=yaml.FullLoader) + config = yaml.load(configfile) with open(template_name, 'r') as templatefile: template = Template(templatefile.read()) -- GitLab