Skip to content

skip lines that start with 'module-version' when determining whether a module exists in ModulesTool.exist #3379

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

Merged
casparvl merged 10 commits into from
Jul 6, 2020
Merged

skip lines that start with 'module-version' when determining whether a module exists in ModulesTool.exist #3379

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
32fefa9
skip lines that start with 'module-version' when determining whether …
boegel Jul 6, 2020
012edac
fix long line
boegel Jul 6, 2020
f237afe
check for errors before skipping lines that start with 'module-' in M…
boegel Jul 6, 2020
a56bc4c
fix long line
boegel Jul 6, 2020
d8db740
also skip WARNING lines in output of 'module show' + more logging
boegel Jul 6, 2020
e483fe4
add missing single quote in log message
boegel Jul 6, 2020
b63c952
don't use space in if statement to skip 'module-version' lines in 'mo…
boegel Jul 6, 2020
03fbb3a
clean up log messages in ModulesTool.exist
boegel Jul 6, 2020
def5d3f
enhance test for ModulesTool.exist to catch bug fixes in #3379
boegel Jul 6, 2020
4b8137a
revisit log messages in ModulesTool.exist w.r.t. debug/info
boegel Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion easybuild/tools/modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,23 +557,32 @@ def mod_exists_via_show(mod_name):
mod_exists_regex = r'\s*/.+:\s*'
for line in stderr.split('\n'):
# skip whitespace lines
self.log.debug("Checking line '%s' to determine whether %s exists...", line)
self.log.debug("Checking line '%s' to determine whether %s exists...", line, mod_name)
Comment thread
boegel marked this conversation as resolved.
if OUTPUT_MATCHES['whitespace'].search(line):
self.log.debug("Treating line '%s' as whitespace, so skipping it", line)
Copy link
Copy Markdown
Member

@wpoely86 wpoely86 Jul 6, 2020

Choose a reason for hiding this comment

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

isn't this overly verbose, even for debugging?

Copy link
Copy Markdown
Member Author

@boegel boegel Jul 6, 2020

Choose a reason for hiding this comment

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

It helped a lot with figuring out the problem reported in #3376, so no.

continue

# if any errors occured, conclude that module doesn't exist
if OUTPUT_MATCHES['error'].search(line):
self.log.debug("Line '%s' looks like an error, so concluding that %s doesn't exist", mod_name)
Comment thread
boegel marked this conversation as resolved.
Outdated
break

# skip warning lines, which may be produced by modules tool but should not be used
# to determine whether a module file exists
if line.startswith('WARNING: '):
Comment thread
boegel marked this conversation as resolved.
self.log.debug("Skipping warning line '%s'", line)
continue

# skip lines that start with 'module-' (like 'module-version'),
# see https://github.com/easybuilders/easybuild-framework/issues/3376
if line.startswith('module- '):
self.log.debug("Skipping line '%s' since it starts with 'module-version'", line)
Comment thread
boegel marked this conversation as resolved.
Outdated
continue

# if line matches pattern that indicates an existing module file, the module file exists
self.log.debug("Determining whether module %s exists using line '%s'", mod_name, line)
res = bool(re.match(mod_exists_regex, line))
self.log.debug("Result for existence check of %s based on 'module show' output: %s", mod_name, res)
Comment thread
boegel marked this conversation as resolved.
Outdated
break

return res
Expand Down
⚡