mirror of
https://github.com/Pmodules/Pmodules.git
synced 2026-08-05 10:52:26 +02:00
changes made in version 1.0 merged/added
- Issue #176, MR !149 relocatable modulecmd - Issue #175, MR !148 new logmessage format - Issue #173, MR !146 additional dirs in search path of CMake and pkgconfig - Issue #172, MR !145: fix in reading legacy variants files
This commit is contained in:
@@ -367,6 +367,9 @@ bash_expand(){
|
||||
|
||||
build_modules_legacy() {
|
||||
find_variants_files(){
|
||||
shopt -q nullglob || :
|
||||
local -i nullglob_set=$?
|
||||
|
||||
local files=( "${BUILDBLOCK_DIR}"/*/"${BNAME_VARIANTS}"\.${opt_system} )
|
||||
files+=( "${BUILDBLOCK_DIR}"/*/"${BNAME_VARIANTS}.$(uname -s)" )
|
||||
local f
|
||||
@@ -375,6 +378,10 @@ build_modules_legacy() {
|
||||
|| [[ -e "${f}.$(uname -s)" ]] \
|
||||
|| files+=( "$f" )
|
||||
done
|
||||
if (( ${#files[@]} == 0 )); then
|
||||
std::die 2 "No suitable variants file found!"
|
||||
fi
|
||||
(( nullglob_set == 1 )) && shopt -u nullglob
|
||||
std::upvar "$1" "${files[@]}"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user