From 06d50e9e8a0539296bfe186d0634247aa65a64fa Mon Sep 17 00:00:00 2001 From: ocaisa Date: Fri, 13 Jun 2025 17:37:23 +0200 Subject: [PATCH 1/2] Update EESSI-install-software.sh --- EESSI-install-software.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh index bf27492a..3051670b 100755 --- a/EESSI-install-software.sh +++ b/EESSI-install-software.sh @@ -359,7 +359,7 @@ else for easystack_file in ${rebuild_easystacks} ${new_easystacks}; do # make sure that easystack file being picked up is for EESSI version that we're building for... - echo "${easystack_file}" | grep -q "^easystacks/${EESSI_VERSION}/" + echo "${easystack_file}" | grep -q "^easystacks/software.eessi.io/${EESSI_VERSION}/" if [ $? -ne 0 ]; then fatal_error "Easystack file ${easystack_file} is not intended for EESSI version ${EESSI_VERSION}, giving up!" fi From 139191ba499754b4a14dfb5a4ebbcb812f07ce5b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 13 Jun 2025 18:26:22 +0200 Subject: [PATCH 2/2] fix check for location of easystack file vs EESSI version --- EESSI-install-software.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh index 3051670b..c491819f 100755 --- a/EESSI-install-software.sh +++ b/EESSI-install-software.sh @@ -359,7 +359,7 @@ else for easystack_file in ${rebuild_easystacks} ${new_easystacks}; do # make sure that easystack file being picked up is for EESSI version that we're building for... - echo "${easystack_file}" | grep -q "^easystacks/software.eessi.io/${EESSI_VERSION}/" + echo "${easystack_file}" | grep -q "^easystacks/$(basename ${EESSI_CVMFS_REPO})/${EESSI_VERSION}/" if [ $? -ne 0 ]; then fatal_error "Easystack file ${easystack_file} is not intended for EESSI version ${EESSI_VERSION}, giving up!" fi