Remove python2-ism in root package (#14223)
This commit is contained in:
parent
af249d3cf6
commit
5940ec0d74
@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
from spack import *
|
from spack import *
|
||||||
import sys
|
import sys
|
||||||
import types
|
|
||||||
|
|
||||||
|
|
||||||
class Root(CMakePackage):
|
class Root(CMakePackage):
|
||||||
@ -450,7 +449,7 @@ def _process_opts(self, *opt_lists):
|
|||||||
|
|
||||||
def _process_opt(opt_name, cond_or_variant=None):
|
def _process_opt(opt_name, cond_or_variant=None):
|
||||||
val = cond_or_variant if \
|
val = cond_or_variant if \
|
||||||
isinstance(cond_or_variant, types.BooleanType) else \
|
isinstance(cond_or_variant, bool) else \
|
||||||
('+{variant}'.format(variant=cond_or_variant or opt_name)
|
('+{variant}'.format(variant=cond_or_variant or opt_name)
|
||||||
in self.spec)
|
in self.spec)
|
||||||
return '-D{opt}:BOOL={val}'.format(opt=opt_name, val='ON' if
|
return '-D{opt}:BOOL={val}'.format(opt=opt_name, val='ON' if
|
||||||
|
Loading…
Reference in New Issue
Block a user