Resolved conflict

Author: Caspar van Leeuwen

eessi_software_reproduce_stack.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import argparse
 import bz2
 import glob
@@ -14,12 +16,12 @@
 
 The script
  - Determines all software that was installed in the reference prefix
- - Sorts it in order of installation. For software that was later rebuild, the original installation time is used.
+ - Sorts it in order of installation. For software that was later rebuilt, the original installation time is used.
  - In the installation order, easyconfig names are added to easystack files
- - A new easystack file is started when either the easybuild version to be used changes, or when the maximum build
+ - A new easystack file is started when either the EasyBuild version to be used changes, or when the maximum build
  time is exceeded (build times of the software in the reference software subdir are used to estimate this)
 
-By sticking to the original order in which software was installed, using the robot should not be needed. Since nothing
+By sticking to the original order in which software was installed, using the robot option should not be needed. Since nothing
 is installed by the robot, one is able to guarantee that the same easyconfigs and easyblocks are used that were
 used during original installation time.
 
@@ -29,10 +31,9 @@
 Example:
 
 python3 eessi_software_reproduce_stack.py --reference-software-subdir=x86_64/amd/zen2 --eessi-version 2025.06
-
 will create easystacks that allow you to replicate the software installed in
 /cvmfs/software.eessi.io/versions/2025.06/<eessi-version>/software/linux/<reference-software-subdir>,
-provided the logs of these installations where backed up to
+provided the logs of these installations were backed up to
 /cvmfs/software.eessi.io/versions/2025.06/<eessi-version>/software/linux/<reference-software-subdir>/reprod
 (which was standard practice starting with EESSI version 2025.06).
 
@@ -204,8 +205,7 @@ def inner_loop(software_name):
 
 # Each worker in the pool creates its own software info dict. The result of the map function is a list of these dicts
 # Here, we merge all these dicts into one. Note that we know the keys to be unique, so no risk of clashes
-
-software_info = {k: v for d in software_info_list if d for k, v in d.items()}   # laatste dict bepaalt de waarde
+software_info = {k: v for d in software_info_list if d for k, v in d.items()}
 print(f"Gathered information for {len(software_info)} software installations (including versions) in {root_dir}")
 if args.debug:
     import pprint