zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use space characters to separate preferred variants from package name and each other

Browse Source
This commit is contained in:
Paul Hopkins 2016-07-22 09:11:26 +01:00
parent e04662f84f
commit 5eebb2defa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/preferred_packages.py
View File

@ -162,8 +162,8 @@ def spec_preferred_variants(self, pkgname):
"""Return a VariantMap of preferred variants and their values""" """Return a VariantMap of preferred variants and their values"""
variants = self.preferred.get(pkgname, {}).get('variants', '') variants = self.preferred.get(pkgname, {}).get('variants', '')
if not isinstance(variants, basestring): if not isinstance(variants, basestring):
variants = "".join(variants) variants = " ".join(variants)
return spack.spec.Spec(pkgname + variants).variants return spack.spec.Spec("%s %s" % (pkgname, variants)).variants
def version_compare(self, pkgname, a, b): def version_compare(self, pkgname, a, b):
"""Return less-than-0, 0, or greater than 0 if version a of pkgname is """Return less-than-0, 0, or greater than 0 if version a of pkgname is