Skip to content

Commit 356341f

Browse files
committed
Use upstream --bwrap functionality
Using EB 5.3.0 + easybuilders/easybuild-framework#5173 This also improves diagnostics a bit, with the name of the tarball at the tail end of the screen output.
1 parent 853101a commit 356341f

2 files changed

Lines changed: 3 additions & 46 deletions

File tree

bwrapcmd.py

Lines changed: 0 additions & 42 deletions
This file was deleted.

eb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,13 +264,12 @@ for rsnt_arch in $(IFS=","; echo $arch); do
264264
export MODULEPATH=$EASYBUILD_ROOT/$EASYBUILD_SUBDIR_MODULES:$MODULEPATH
265265
if [ -n "$use_bwrap" ]; then
266266
bwrapdir=$(mktemp -d -p /bwrap)
267-
echo "Building via bwrap in $bwrapdir"
268-
bwrapcmd=$(RSNT_ARCH="$rsnt_arch" python $EASYBUILD_CONFIG_ROOT/../bwrapcmd.py $ec $bwrapdir)
269-
if $bwrapcmd $EB --installpath-modules=$bwrapdir/$EASYBUILD_SUBDIR_MODULES --configfiles=$LOCAL_EASYBUILD_CONFIGFILES "${NEW_ARGS[@]}" --ignore-locks; then
267+
if $EB --configfiles=$LOCAL_EASYBUILD_CONFIGFILES "${NEW_ARGS[@]}" --ignore-locks --experimental --bwrap --bwrap-installpath=$bwrapdir; then
270268
tarcmd=$(RSNT_ARCH="$rsnt_arch" YEAR=$YEAR python $EASYBUILD_CONFIG_ROOT/../tarcmd.py $ec $bwrapdir)
271269
echo "Running $tarcmd"
272270
if $tarcmd; then
273-
echo "removing $bwrapdir"
271+
echo "Sucessfully finished $tarcmd"
272+
echo "Removing $bwrapdir"
274273
rm -rf $bwrapdir
275274
fi
276275
fi

0 commit comments

Comments
 (0)