From 7caf955d69d24faf4cbb3445027c4d564e29f0b7 Mon Sep 17 00:00:00 2001
From: hwikle-lanl <154543628+hwikle-lanl@users.noreply.github.com>
Date: Fri, 31 Jan 2025 10:47:13 -0700
Subject: [PATCH] Bug module wrapper regex (#806)

* Fix regex in ModuleWrapperCatElem to account for versioned modules

* Convert dashes to underscores in version names
---
 lib/pavilion/module_wrapper.py          | 2 +-
 lib/pavilion/test_config/file_format.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pavilion/module_wrapper.py b/lib/pavilion/module_wrapper.py
index 45ef1a0e4..ab362c27a 100644
--- a/lib/pavilion/module_wrapper.py
+++ b/lib/pavilion/module_wrapper.py
@@ -404,7 +404,7 @@ def _load(self, var_man: VariableSetManager, req_name: str, version: str) \
                 actions.append(ModuleLoad(module_name=mod_name, version=mod_vers))
 
         env_vars = collections.OrderedDict()
-        vers_var_name = '{}_VERSION'.format(self.name.replace('*', 'any'))
+        vers_var_name = '{}_VERSION'.format(self.name.replace('*', 'any').replace('-', '_'))
         if version:
             env_vars[vers_var_name] = version
         else:
diff --git a/lib/pavilion/test_config/file_format.py b/lib/pavilion/test_config/file_format.py
index fe48d0374..24468f1e4 100644
--- a/lib/pavilion/test_config/file_format.py
+++ b/lib/pavilion/test_config/file_format.py
@@ -395,7 +395,7 @@ class TestCatElem(yc.CategoryElem):
 class ModuleWrapperCatElem(yc.CategoryElem):
     """Allow glob wildcards in key names."""
 
-    _NAME_RE = re.compile(r'^[a-zA-Z*?+][a-zA-Z0-9_*+?-]*$')
+    _NAME_RE = re.compile(r'^[a-zA-Z*?+][a-zA-Z0-9_*+?-]*(/[a-zA-Z0-9._-]+)?$')
     type=OrderedDict