@@ -150,21 +150,20 @@ def inner_loop(software_name):
150150 initial_build_time = datetime .strptime ("19700101_000000UTC" , "%Y%m%d_%H%M%SUTC" )
151151
152152 # If we're overriding the version of EasyBuild to build EasyBuild, simply define so here
153+ datestamp_dir_last_build = os .path .join (software_version_dir , os .listdir (software_version_dir )[- 1 ])
153154 if override_easybuild_version :
154155 easybuild_version = eb_override_version
155156 else :
156-
157157 # Extract the EasyBuild version from the build log of the last build
158- datestamp_dir_last_build = os .path .join (software_version_dir , os .listdir (software_version_dir )[- 1 ])
159158 build_log_path_glob = os .path .join (datestamp_dir_last_build , "easybuild" , f"easybuild-{ software_name } -*.log.bz2" )
160159 matching_files = glob .glob (build_log_path_glob )
161160 if len (matching_files ) != 1 :
162161 raise ValueError (f"Expected only one file to match { build_log_path_glob } . Instead got: { matching_files } " )
163162 easybuild_version = get_easybuild_version (matching_files [0 ])
164163
165164 # Extract the paths to the easyblock and easyconfig files used for the last installation
166- easyblock_path = os .path .join (software_version_dir , "easybuild" , "reprod" , "easyblocks" , "*.py" )
167- easyconfig_path = os .path .join (software_version_dir , "easybuild" , f"{ software_name } -{ software_version } .eb" )
165+ easyblock_path = os .path .join (datestamp_dir_last_build , "easybuild" , "reprod" , "easyblocks" , "*.py" )
166+ easyconfig_path = os .path .join (datestamp_dir_last_build , "easybuild" , f"{ software_name } -{ software_version } .eb" )
168167
169168 # Store the software information
170169 software_info [software_name + "-" + software_version ] = {
0 commit comments