Skip to content
Snippets Groups Projects
Commit 3039bb09 authored by Philipp Spilger's avatar Philipp Spilger
Browse files

fix: Allow empty temporary meta directory

Change-Id: Ibcbee09ffde55f21716465921f79848c5ae8eca1
parent 534f4493
No related branches found
No related tags found
No related merge requests found
...@@ -254,6 +254,7 @@ with tempfile.TemporaryDirectory(prefix="spack-", dir=env["TMPDIR"]) \ ...@@ -254,6 +254,7 @@ with tempfile.TemporaryDirectory(prefix="spack-", dir=env["TMPDIR"]) \
meta_dir = args.meta_dir meta_dir = args.meta_dir
else: else:
meta_dir = temporary_directory.joinpath("meta") meta_dir = temporary_directory.joinpath("meta")
meta_dir.mkdir(parents=True)
env = env | {"YASHCHIKI_META_DIR": meta_dir} env = env | {"YASHCHIKI_META_DIR": meta_dir}
# host environment storage filename defaults to temporary file # host environment storage filename defaults to temporary file
......
...@@ -39,7 +39,7 @@ From: ${DOCKER_BASE_IMAGE} ...@@ -39,7 +39,7 @@ From: ${DOCKER_BASE_IMAGE}
rsync -av "${ROOT_DIR}"/lib/yashchiki/*.awk "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}" rsync -av "${ROOT_DIR}"/lib/yashchiki/*.awk "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av "${ROOT_DIR}"/share/yashchiki/patches "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}" rsync -av "${ROOT_DIR}"/share/yashchiki/patches "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
mkdir -p "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}" mkdir -p "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}"
rsync -av "${META_DIR_OUTSIDE}"/* "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}" rsync -av "${META_DIR_OUTSIDE}/" "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}"
# init scripts for user convenience # init scripts for user convenience
mkdir -p "\${SINGULARITY_ROOTFS}/opt/init" mkdir -p "\${SINGULARITY_ROOTFS}/opt/init"
rsync -av "${ROOT_DIR}"/share/yashchiki/misc-files/init/*.sh "\${SINGULARITY_ROOTFS}/opt/init" rsync -av "${ROOT_DIR}"/share/yashchiki/misc-files/init/*.sh "\${SINGULARITY_ROOTFS}/opt/init"
......
...@@ -44,7 +44,7 @@ From: ${DOCKER_BASE_IMAGE} ...@@ -44,7 +44,7 @@ From: ${DOCKER_BASE_IMAGE}
rsync -av "${ROOT_DIR}"/lib/yashchiki/*.awk "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}" rsync -av "${ROOT_DIR}"/lib/yashchiki/*.awk "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av "${ROOT_DIR}"/share/yashchiki/patches "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}" rsync -av "${ROOT_DIR}"/share/yashchiki/patches "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
mkdir -p "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}" mkdir -p "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}"
rsync -av "${META_DIR_OUTSIDE}"/* "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}" rsync -av "${META_DIR_OUTSIDE}/" "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}"
# init scripts for user convenience # init scripts for user convenience
mkdir -p "\${SINGULARITY_ROOTFS}/opt/init" mkdir -p "\${SINGULARITY_ROOTFS}/opt/init"
rsync -av "${ROOT_DIR}"/share/yashchiki/misc-files/init/*.sh "\${SINGULARITY_ROOTFS}/opt/init" rsync -av "${ROOT_DIR}"/share/yashchiki/misc-files/init/*.sh "\${SINGULARITY_ROOTFS}/opt/init"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment