Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix Lmod spider output in generated modules #1583

Merged
merged 10 commits into from Feb 23, 2016
Merged

fix Lmod spider output in generated modules #1583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b1087ec
fix Lmod spider output in generated modules
pescobar Jan 29, 2016
d799d66
trying to fix the unit tests
pescobar Jan 29, 2016
04d6b47
fix sanity checks. try2
pescobar Jan 29, 2016
e6ef641
undo previous change
pescobar Feb 22, 2016
94676ff
correct fix, I hope :)
pescobar Feb 22, 2016
dc60287
trying to fix unit tests
pescobar Feb 22, 2016
f11781a
change suggested by @geimer
pescobar Feb 22, 2016
93f51e2
removed space
pescobar Feb 22, 2016
b057174
trying to fix unit tests
pescobar Feb 22, 2016
6ac767d
add Description string also in lua modulefiles
pescobar Feb 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions easybuild/tools/module_generator.py
View file
Open in desktop
Expand Up @@ -215,7 +215,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]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please make the same change for the Lua module generator (line 438)


lines = [
"proc ModulesHelp { } {",
Expand Down Expand Up @@ -435,7 +435,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]])",
Expand Down
4 changes: 2 additions & 2 deletions test/framework/module_generator.py
View file
Open in desktop
Expand Up @@ -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,
'',
Expand All @@ -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,
'',
Expand Down
4 changes: 2 additions & 2 deletions test/framework/toy_build.py
View file
Open in desktop
Expand Up @@ -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'',
Expand Down Expand Up @@ -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'',
Expand Down