From 12517c59f9319db6d924442c7b7ffbbd5b1c0833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=9D=8E?= <github@wu-kan.cn>
Date: Sun, 24 Mar 2024 21:17:46 +0800
Subject: [PATCH] update

---
 Dockerfile                          | 6 +++---
 lib/spack/spack/util/compression.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5281fd7..a7cf5c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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}
@@ -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
@@ -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}
diff --git a/lib/spack/spack/util/compression.py b/lib/spack/spack/util/compression.py
index b4ac811..f7dd243 100644
--- a/lib/spack/spack/util/compression.py
+++ b/lib/spack/spack/util/compression.py
@@ -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: