Skip to content

Commit

Permalink
Update easyblock.py
Browse files Browse the repository at this point in the history
Bug fixes round #1
  • Loading branch information
sntgluca authored and rjeschmi committed Mar 19, 2015
1 parent e2a9fe6 commit 793a505
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions easybuild/framework/easyblock.py
Original file line number Diff line number Diff line change
Expand Up @@ -1447,9 +1447,11 @@ def package_step(self):
"""Package software (e.g. into an RPM)."""
rpmname = "nxprog-%s-%s" % (self.name, self.version)
os.chdir("/tmp")
deplist=""
deplist+=" ".join(["--dependency " + i for i in (map(">".join, [(self.toolchain.name, self.toolchain.version)]))])
deplist+=" ".join(["--dependency " + i for i in (map(lambda x:x["name"] + ">" + x["version"], self.cfg.dependencies()))])
toolchaindep = "=".join([self.toolchain.name, self.toolchain.version])
deplist = " ".join(["--dependency", toolchaindep])
deplist += " ".join(["--dependency" + i
for i in (map(lambda x:x["name"] + "=" + x["version"], self.cfg.dependencies()))
])
cmd = "fpm --workdir /tmp -t rpm -n %s -s dir %s %s" % (rpmname, deplist, self.installdir)
(out, _) = run_cmd(cmd, log_all=True, simple=False)

Expand Down Expand Up @@ -1811,8 +1813,6 @@ def prepare_step_spec(initial):

return steps



def run_all_steps(self, run_test_cases):
"""
Build and install this software.
Expand Down

0 comments on commit 793a505

Please sign in to comment.