Fix #6525: WIP

radiasoft · Nov 30, 2023 · 71db230 · 71db230
1 parent fc82168
commit 71db230
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/sirepo/exporter.py b/sirepo/exporter.py
@@ -11,6 +11,7 @@
 from sirepo import sim_data
 from sirepo import simulation_db
 from sirepo import template
+import re
 import sirepo.sim_run
 import sirepo.util
 
@@ -77,10 +78,11 @@ def _create_zip(sim, out_dir, qcall):
                         # TODO (gurhar1133): if not first sim ignore run lib files with
                         # regex like:
                         #     /bunchFile-sourceFile||command_run_setup-expand_for|command_distribution-fname|io-partfile/
-                        z.write(
-                            sim_data.get_class(sim_obj.simulationType).lib_file_abspath(lib_file, qcall=qcall),
-                            arcname=f"related_sim_{idx}_lib/" + lib_file,
-                        )
+                        if re.match(r"(bunchFile-sourceFile|command_run_setup-expand_for|command_distribution-fname|io-partfile)", lib_file) is None:
+                            z.write(
+                                sim_data.get_class(sim_obj.simulationType).lib_file_abspath(lib_file, qcall=qcall),
+                                arcname=f"related_sim_{idx}_lib/" + lib_file,
+                            )
         z.writestr(
             simulation_db.SIMULATION_DATA_FILE,
             pkjson.dump_pretty(data, pretty=True),

diff --git a/sirepo/importer.py b/sirepo/importer.py
@@ -127,7 +127,9 @@ def _import_related_sims(data, zip_bytes, qcall=None):
                     d,
                     qcall=qcall,
                 )
-                for lib_file in [f for f in z.namelist() if f.startswith(f"related_sim_{index}_lib")]:
+                lib_files = [f for f in z.namelist() if f.startswith(f"related_sim_{index}_lib")]
+                pkdp("\n\n\nlib_files={}", lib_files)
+                for lib_file in lib_files:
                     pykern.pkio.write_text(
                         simulation_db.simulation_lib_dir(d.simulationType, qcall=qcall).join(lib_file.split("/")[-1]),
                         z.read(lib_file),