From bb8558819ae363a8d64a96a5ed3b8aace52467b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 21 Jul 2025 10:12:06 +0200 Subject: [PATCH 1/2] handle reprod dirs in tarball overview --- scripts/automated_ingestion/eessitarball.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/automated_ingestion/eessitarball.py b/scripts/automated_ingestion/eessitarball.py index c03b2a64..100d3da4 100644 --- a/scripts/automated_ingestion/eessitarball.py +++ b/scripts/automated_ingestion/eessitarball.py @@ -145,15 +145,21 @@ def get_contents_overview(self): for m in members if m.isfile() and PurePosixPath(m.path).match(os.path.join(prefix, 'modules', '*', '*', '*.lua')) ] + reprod_dirs = [ + m.path + for m in members + if m.isdir() and PurePosixPath(m.path).match(os.path.join(prefix, 'reprod', '*', '*', '*')) + ] other = [ # anything that is not in /software nor /modules m.path for m in members if not PurePosixPath(prefix).joinpath('software') in PurePosixPath(m.path).parents and not PurePosixPath(prefix).joinpath('modules') in PurePosixPath(m.path).parents + and not PurePosixPath(prefix).joinpath('reprod') in PurePosixPath(m.path).parents # if not fnmatch.fnmatch(m.path, os.path.join(prefix, 'software', '*')) # and not fnmatch.fnmatch(m.path, os.path.join(prefix, 'modules', '*')) ] - members_list = sorted(swdirs + modfiles + other) + members_list = sorted(swdirs + modfiles + reprod_dirs + other) # Construct the overview. tar_members = '\n'.join(members_list) From 08579697b0ddd24e44cda83c597a3e69b6aef1d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 21 Jul 2025 10:22:41 +0200 Subject: [PATCH 2/2] Update scripts/automated_ingestion/eessitarball.py Co-authored-by: ocaisa --- scripts/automated_ingestion/eessitarball.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/automated_ingestion/eessitarball.py b/scripts/automated_ingestion/eessitarball.py index 100d3da4..74d99ebc 100644 --- a/scripts/automated_ingestion/eessitarball.py +++ b/scripts/automated_ingestion/eessitarball.py @@ -150,7 +150,7 @@ def get_contents_overview(self): for m in members if m.isdir() and PurePosixPath(m.path).match(os.path.join(prefix, 'reprod', '*', '*', '*')) ] - other = [ # anything that is not in /software nor /modules + other = [ # anything that is not in /software nor /modules nor /reprod m.path for m in members if not PurePosixPath(prefix).joinpath('software') in PurePosixPath(m.path).parents