From 06c41be687dd9650f73351be2ad78a173833fe97 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 29 Jul 2022 14:47:33 +0200
Subject: [PATCH] modbuild/libpbuild: print warnings if deprecated functions
 are used

---
 Pmodules/libpbuild.bash | 23 ++++++++++++++++++++---
 Pmodules/modbuild.in    |  5 ++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Pmodules/libpbuild.bash b/Pmodules/libpbuild.bash
index ddb954f..b313d6f 100644
--- a/Pmodules/libpbuild.bash
+++ b/Pmodules/libpbuild.bash
@@ -720,9 +720,26 @@ pbuild::install_shared_libs() {
 
 ###############################################################################
 #
-# This is the main entry function called by modbuild!
+# The following two functions are the entry points called by modbuild!
 #
-pbuild.build_module() {
+
+declare yaml_config='yes'
+pbuild.build_module_legacy(){
+	yaml_config='no'
+	_build_module "$@"
+}
+readonly -f pbuild.build_module_legacy
+
+pbuild.build_module_yaml(){
+	_build_module "$@"
+}
+readonly -f pbuild.build_module_yaml
+
+#..............................................................................
+#
+# The real worker function.
+#
+_build_module() {
 	declare -gx module_name="$1"
 	declare -gx module_version="$2"
 	declare -gx module_release="$3"
@@ -1583,7 +1600,7 @@ pbuild.build_module() {
 	cleanup_modulefiles
 	std::info "* * * * *\n"
 }
-readonly -f pbuild.build_module
+readonly -f _build_module
 
 # Local Variables:
 # mode: sh
diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in
index a87ab5f..5514f0c 100755
--- a/Pmodules/modbuild.in
+++ b/Pmodules/modbuild.in
@@ -436,7 +436,7 @@ build_modules_legacy() {
                 version="${tokens[0]#*/}"
                 release="${tokens[1]}"
                 with_modules=( "${tokens[@]:2}" )
-                pbuild.build_module \
+                pbuild.build_module_legacy \
                         "${name}" "${version}" \
                         "${release}" "${with_modules[@]}"
         done
@@ -647,7 +647,7 @@ build_modules_yaml(){
 					     "${relstage}" "${with_modules[@]}"
 				done < <(bash_expand "" ${deps[@]}|${awk} "${pattern}")
 			else
-				pbuild.build_module \
+				pbuild.build_module_yaml \
 				     "${name}" "${v##*/}" \
 				     "${relstage}"
 			fi
@@ -655,7 +655,6 @@ build_modules_yaml(){
 	done
 }
 
-
 build_modules() {
 	if [[ -n $(ls "${BUILDBLOCK_DIR}/files/${BNAME_VARIANTS}"*.yaml 2>/dev/null) ]]; then
 		build_modules_yaml "$@"