Skip to content

Commit

Permalink
Fix accidental module whitespace/order changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Micket committed Aug 28, 2024
1 parent a0fa9e5 commit 57cc313
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions easybuild/tools/module_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,8 @@ def get_description(self, conflict=True):
for line in self._generate_whatis_lines()
])

lines.extend(['', "set root " + self.app.installdir])

if self.app.cfg['moduleloadnoconflict']:
cond_unload = self.conditional_statement(self.is_loaded('%(name)s'), "module unload %(name)s")
lines.extend([
Expand All @@ -844,9 +846,7 @@ def get_description(self, conflict=True):
# - 'conflict Compiler/GCC/4.8.2/OpenMPI' for 'Compiler/GCC/4.8.2/OpenMPI/1.6.4'
lines.extend(['', "conflict %s" % os.path.dirname(self.app.short_mod_name)])

lines.extend(['', "set root " + self.app.installdir])

return '\n'.join([''] + lines + [''])
return '\n'.join(lines + [''])

def getenv_cmd(self, envvar, default=None):
"""
Expand Down Expand Up @@ -1279,7 +1279,7 @@ def get_description(self, conflict=True):
# https://github.com/TACC/Lmod/issues/428
lines.extend(['', self.conditional_statement(self.check_version("8", "2", "8"), extensions_stmt)])

return '\n'.join([''] + lines + [''])
return '\n'.join(lines + [''])

def getenv_cmd(self, envvar, default=None):
"""
Expand Down

0 comments on commit 57cc313

Please sign in to comment.