Skip to content

[bugfix] Fix bug in unloading of conflicting modules #405

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
merged 4 commits into from
Jul 25, 2018
Merged

[bugfix] Fix bug in unloading of conflicting modules #405

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
833a34a
Fix bug in unloading of conflicting modules
Jul 24, 2018
6043a9f
Add an empty line for clarity
Jul 24, 2018
f2583c3
Address PR comments
Jul 25, 2018
f338b26
Merge branch 'master' into bugfix/module_unload_accumulation
vkarak Jul 25, 2018
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
9 changes: 5 additions & 4 deletions reframe/core/environments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Environment:
to be set when this environment is loaded by the framework.
Users may not create or modify directly environments.
"""
name = fields.StringPatternField('name', '(\w|-)+')
name = fields.StringPatternField('name', r'(\w|-)+')
modules = fields.TypedListField('modules', str)
variables = fields.TypedDictField('variables', str, str)

Expand Down Expand Up @@ -80,12 +80,13 @@ def load(self):
if rt.modules_system.is_module_loaded(m):
self._preloaded.add(m)

self._conflicted += rt.modules_system.load_module(m, force=True)
for conflict in self._conflicted:
stmts = rt.modules_system.emit_unload_commands(conflict)
conflicted = rt.modules_system.load_module(m, force=True)
for c in conflicted:
stmts = rt.modules_system.emit_unload_commands(c)
self._load_stmts += stmts

self._load_stmts += rt.modules_system.emit_load_commands(m)
self._conflicted += conflicted

for k, v in self._variables.items():
if k in os.environ:
Expand Down