Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
wu-kan authored Mar 24, 2024
1 parent eeebd47 commit 12517c5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG SCC_IMAGE=debian:bookworm-slim
FROM ${SCC_IMAGE} as builder
ARG SCC_TARGET=x86_64_v3
ARG SCC_TAG=latest
ARG SCC_OPT=/root/sccenv/${SCC_TAG}
ARG SCC_OPT=/sccenv/${SCC_TAG}
ARG SCC_SPACK_TAG=v0.21.2
ENV SCC_SETUP_ENV=${SCC_OPT}/sysu-scc-spack-repo-${SCC_TAG}/share/sysu-scc-spack-repo/setup-env.sh
COPY . ${SCC_OPT}/sysu-scc-spack-repo-${SCC_TAG}
Expand All @@ -26,7 +26,7 @@ cat >${SCC_SETUP_ENV} <<END
#!/bin/sh
export SPACK_ROOT=\$(dirname $SCC_SETUP_ENV)/../../../spack
export SPACK_PYTHON=$(spack location -i python)/bin/python3
. \$(dirname $SCC_SETUP_ENV)/../../../spack/share/spack/setup-env.sh
. \$(dirname \$SCC_SETUP_ENV)/../../../spack/share/spack/setup-env.sh
END
cat ${SCC_SETUP_ENV}
EOF
Expand All @@ -41,6 +41,6 @@ apt-get clean -y
rm -rf /var/lib/apt/lists/*
EOF
ARG SCC_TAG=latest
ARG SCC_OPT=/root/sccenv/${SCC_TAG}
ARG SCC_OPT=/sccenv/${SCC_TAG}
ENV SCC_SETUP_ENV=${SCC_OPT}/sysu-scc-spack-repo-${SCC_TAG}/share/sysu-scc-spack-repo/setup-env.sh
COPY --from=builder ${SCC_OPT} ${SCC_OPT}
4 changes: 2 additions & 2 deletions lib/spack/spack/util/compression.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ def _untar(archive_file: str, remove_archive_file: bool = False) -> str:
Can be one of .tar(.[gz|bz2|xz|Z]) or .(tgz|tbz|tbz2|txz).
"""
try:
return _system_untar(archive_file, remove_archive_file)
except:
return _py_untar(archive_file, remove_archive_file)
except:
return _system_untar(archive_file, remove_archive_file)


def _py_untar(archive_file: str, remove_archive_file: bool = False) -> str:
Expand Down

0 comments on commit 12517c5

Please sign in to comment.