Merge pull request #1583 from pescobar/lmod-spider-output

fix Lmod spider output in generated modules
easybuilders · Feb 23, 2016 · 96340f2 · 96340f2
2 parents fa00e01 + 6ac767d
commit 96340f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/easybuild/tools/module_generator.py b/easybuild/tools/module_generator.py
@@ -225,7 +225,7 @@ def get_description(self, conflict=True):
         whatis = self.app.cfg['whatis']
         if whatis is None:
             # default: include single 'whatis' statement with description as contents
-            whatis = [description]
+            whatis = ["Description: %s" % description]
 
         lines = [
             "proc ModulesHelp { } {",
@@ -462,7 +462,7 @@ def get_description(self, conflict=True):
         whatis = self.app.cfg['whatis']
         if whatis is None:
             # default: include single 'whatis' statement with description as contents
-            whatis = [description]
+            whatis = ["Description: %s" % description]
 
         lines = [
             "help([[%(description)s]])",

diff --git a/test/framework/module_generator.py b/test/framework/module_generator.py
@@ -83,7 +83,7 @@ def test_descr(self):
                 "    }",
                 "}",
                 '',
-                "module-whatis {%s}" % gzip_txt,
+                "module-whatis {Description: %s}" % gzip_txt,
                 '',
                 "set root %s" % self.modgen.app.installdir,
                 '',
@@ -95,7 +95,7 @@ def test_descr(self):
             expected = '\n'.join([
                 'help([[%s]])' % gzip_txt,
                 '',
-                "whatis([[%s]])" % gzip_txt,
+                "whatis([[Description: %s]])" % gzip_txt,
                 '',
                 'local root = "%s"' % self.modgen.app.installdir,
                 '',

diff --git a/test/framework/toy_build.py b/test/framework/toy_build.py
@@ -798,7 +798,7 @@ def test_toy_module_fulltxt(self):
             mod_txt_regex_pattern = '\n'.join([
                 r'help\(\[\[Toy C program. - Homepage: http://hpcugent.github.com/easybuild\]\]\)',
                 r'',
-                r'whatis\(\[\[Toy C program. - Homepage: http://hpcugent.github.com/easybuild\]\]\)',
+                r'whatis\(\[\[Description: Toy C program. - Homepage: http://hpcugent.github.com/easybuild\]\]\)',
                 r'',
                 r'local root = "%s/software/toy/0.0-tweaked"' % self.test_installpath,
                 r'',
@@ -830,7 +830,7 @@ def test_toy_module_fulltxt(self):
                 r'    }',
                 r'}',
                 r'',
-                r'module-whatis {Toy C program. - Homepage: http://hpcugent.github.com/easybuild}',
+                r'module-whatis {Description: Toy C program. - Homepage: http://hpcugent.github.com/easybuild}',
                 r'',
                 r'set root %s/software/toy/0.0-tweaked' % self.test_installpath,
                 r'',