Skip to content

Commit

Permalink
add empty line before 'built with EasyBuild version X' line in easyco…
Browse files Browse the repository at this point in the history
…nfig, fix debugging msg for extending MODULEPATH (was broken if skip was being used)

Conflicts:

	easybuild/framework/application.py
  • Loading branch information
boegel committed Aug 17, 2012
1 parent 7a171c8 commit 91e6655
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions easybuild/framework/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,7 @@ def make_module(self, fake=False):
txt += self.make_module_extra()
if self.getcfg('pkglist'):
txt += self.make_module_extra_packages()
txt += '\n# built with EasyBuild version %s' % easybuild.VERBOSE_VERSION
txt += '\n# built with EasyBuild version %s\n' % easybuild.VERBOSE_VERSION

try:
f = open(self.moduleGenerator.filename, 'w')
Expand Down Expand Up @@ -1290,10 +1290,10 @@ def packages(self):
modpath = self.make_module(fake=True)
# adjust MODULEPATH tand load module
if self.getcfg('pkgloadmodule'):
self.log.debug("Adding %s to MODULEPATH" % modpath)
if self.skip:
m = Modules()
else:
self.log.debug("Adding %s to MODULEPATH" % modpath)
m = Modules([modpath] + os.environ['MODULEPATH'].split(':'))

if m.exists(self.name(), self.installversion()):
Expand Down

0 comments on commit 91e6655

Please sign in to comment.