Factor out use of os.environ.get('__LMOD_Priority_MODULEPATH')

Author: Flamefire

easybuild/tools/modules.py

@@ -1467,6 +1467,12 @@ def _set_module_path(self, new_mod_path):
             else:
                 os.environ['MODULEPATH'] = new_mod_path
 
+    def _has_module_paths_with_priority(self):
+        """Return True if there are priorities attached to $MODULEPATH"""
+        # We simply check, if the Lmod variable is set and non-empty
+        # See https://github.com/TACC/Lmod/issues/509
+        return bool(os.environ.get('__LMOD_Priority_MODULEPATH'))
+
     def use(self, path, priority=None):
         """
         Add path to $MODULEPATH via 'module use'.
@@ -1486,7 +1492,7 @@ def use(self, path, priority=None):
         else:
             # LMod allows modifying MODULEPATH directly. So do that to avoid the costly module use
             # unless priorities are in use already
-            if os.environ.get('__LMOD_Priority_MODULEPATH'):
+            if self._has_module_paths_with_priority():
                 self.run_module(['use', path])
             else:
                 path = normalize_path(path)
@@ -1511,7 +1517,7 @@ def prepend_module_path(self, path, set_mod_paths=True, priority=None):
         if not modulepath or os.path.realpath(modulepath[0]) != os.path.realpath(path):
             # If no explicit priority is set, but priorities are already in use we need to use a high
             # priority to make sure the path (very likely) ends up at the front
-            if priority is None and os.environ.get('__LMOD_Priority_MODULEPATH'):
+            if priority is None and self._has_module_paths_with_priority():
                 priority = self.HIGH_PRIORITY
             self.use(path, priority=priority)
             modulepath = curr_module_paths(clean=False)