Fix super.make_module_extra calls

Author: Flamefire

easybuild/easyblocks/c/code_server.py

@@ -81,5 +81,4 @@ def sanity_check_step(self):
 
     def make_module_extra(self):
         """Add the default directories to the PATH."""
-        txt = EasyBlock.make_module_extra(self)
-        return txt
+        return EasyBlock.make_module_extra(self)

easybuild/easyblocks/generic/juliabundle.py

@@ -95,5 +95,4 @@ def sanity_check_step(self, *args, **kwargs):
 
     def make_module_extra(self, *args, **kwargs):
         """Custom module environment from JuliaPackage"""
-        mod = super().make_module_extra(*args, **kwargs)
-        return mod
+        return super().make_module_extra(*args, **kwargs)

easybuild/easyblocks/generic/rpackage.py

@@ -344,8 +344,8 @@ def sanity_check_step(self, *args, **kwargs):
         """
         return super().sanity_check_step(EXTS_FILTER_R_PACKAGES, *args, **kwargs)
 
-    def make_module_extra(self):
+    def make_module_extra(self, *args, **kwargs):
         """Add install path to R_LIBS_SITE"""
         # prepend R_LIBS_SITE with install path
         extra = self.module_generator.prepend_paths("R_LIBS_SITE", [self.cfg['exts_subdir']])
-        return super().make_module_extra(extra)
+        return super().make_module_extra(*args, **kwargs) + extra

easybuild/easyblocks/j/java.py

@@ -211,6 +211,6 @@ def make_module_extra(self):
         """
         Set $JAVA_HOME to installation directory
         """
-        txt = PackedBinary.make_module_extra(self)
+        txt = super().make_module_extra()
         txt += self.module_generator.set_environment('JAVA_HOME', self.installdir)
         return txt