Skip to content

Commit 8fb1f95

Browse files
committed
Fix copying of the buildlogs broken by the introduction of pre-run-shell-cmd
1 parent ab03e42 commit 8fb1f95

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

EESSI-install-software.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,14 +412,12 @@ else
412412

413413
# copy EasyBuild log file if EasyBuild exited with an error
414414
if [ ${ec} -ne 0 ]; then
415-
eb_hooks=$EASYBUILD_HOOKS
416-
eb_last_log=$(unset EB_VERBOSE; unset EASYBUILD_HOOKS; eb --last-log)
415+
eb_last_log=$(eb --last-log | grep | grep -vE "==|>>")
417416
# copy to current working directory
418417
cp -a ${eb_last_log} .
419418
echo "Last EasyBuild log file copied from ${eb_last_log} to ${PWD}"
420419
# copy to build logs dir (with context added)
421420
copy_build_log "${eb_last_log}" "${build_logs_dir}"
422-
export EASYBUILD_HOOKS=$eb_hooks
423421
fi
424422

425423
$TOPDIR/check_missing_installations.sh ${easystack_file} ${pr_diff}

0 commit comments

Comments
 (0)