@@ -240,8 +240,6 @@ def process_easystack(easystack_path, args, logfile, testing, init_session_state
240240 # keep copy of original environment, so we can restore it for every easystack entry
241241 init_env = copy .deepcopy (os .environ )
242242
243- global _log
244-
245243 # TODO: insert fast loop that validates if all command line options are valid. If there are errors in options,
246244 # we want to know early on, and this loop potentially builds a lot of packages and could take very long
247245 # for path in orig_paths:
@@ -311,6 +309,9 @@ def process_eb_args(eb_args, eb_go, cfg_settings, modtool, testing, init_session
311309 options = eb_go .options
312310
313311 global _log
312+ # Unpack cfg_settings
313+ (build_specs , _log , logfile , robot_path , search_query , eb_tmpdir , try_to_generate ,
314+ from_pr_list , tweaked_ecs_paths ) = cfg_settings
314315
315316 # determine easybuild-easyconfigs package install path
316317 easyconfigs_pkg_paths = get_paths_for (subdir = EASYCONFIGS_PKG_SUBDIR )
@@ -325,10 +326,6 @@ def process_eb_args(eb_args, eb_go, cfg_settings, modtool, testing, init_session
325326 eb_file = find_easybuild_easyconfig ()
326327 eb_args .append (eb_file )
327328
328- # Unpack cfg_settings
329- (build_specs , _log , logfile , robot_path , search_query , eb_tmpdir , try_to_generate ,
330- from_pr_list , tweaked_ecs_paths ) = cfg_settings
331-
332329 if options .copy_ec :
333330 # figure out list of files to copy + target location (taking into account --from-pr)
334331 eb_args , target_path = det_copy_ec_specs (eb_args , from_pr = from_pr_list , from_commit = options .from_commit )
0 commit comments