summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>2019-08-23 10:45:17 -0700
committerPeter Scheibel <scheibel1@llnl.gov>2019-08-23 10:45:17 -0700
commitb42324c23bf96fa20f05a87aa237e0c50855a0a4 (patch)
treef42e364d19b2f0c2c7392ad8ddb77060db194a93 /lib
parentf199b2d42e010396d3d8f3e905dffd1f128f3dbc (diff)
downloadspack-b42324c23bf96fa20f05a87aa237e0c50855a0a4.tar.gz
spack-b42324c23bf96fa20f05a87aa237e0c50855a0a4.tar.bz2
spack-b42324c23bf96fa20f05a87aa237e0c50855a0a4.tar.xz
spack-b42324c23bf96fa20f05a87aa237e0c50855a0a4.zip
bugfix: template create constructor args (#12536)
c9e214f updated template creation by passing **kwargs to package template classes but the template classes were not updated to accept them; this adds **kwargs to package template initializers where they are needed.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/cmd/create.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py
index fd2a00d6cb..26a26c7678 100644
--- a/lib/spack/spack/cmd/create.py
+++ b/lib/spack/spack/cmd/create.py
@@ -251,14 +251,14 @@ class PythonPackageTemplate(PackageTemplate):
args = []
return args"""
- def __init__(self, name, *args):
+ def __init__(self, name, *args, **kwargs):
# If the user provided `--name py-numpy`, don't rename it py-py-numpy
if not name.startswith('py-'):
# Make it more obvious that we are renaming the package
tty.msg("Changing package name from {0} to py-{0}".format(name))
name = 'py-{0}'.format(name)
- super(PythonPackageTemplate, self).__init__(name, *args)
+ super(PythonPackageTemplate, self).__init__(name, *args, **kwargs)
class RPackageTemplate(PackageTemplate):
@@ -276,14 +276,14 @@ class RPackageTemplate(PackageTemplate):
args = []
return args"""
- def __init__(self, name, *args):
+ def __init__(self, name, *args, **kwargs):
# If the user provided `--name r-rcpp`, don't rename it r-r-rcpp
if not name.startswith('r-'):
# Make it more obvious that we are renaming the package
tty.msg("Changing package name from {0} to r-{0}".format(name))
name = 'r-{0}'.format(name)
- super(RPackageTemplate, self).__init__(name, *args)
+ super(RPackageTemplate, self).__init__(name, *args, **kwargs)
class PerlmakePackageTemplate(PackageTemplate):
@@ -302,14 +302,14 @@ class PerlmakePackageTemplate(PackageTemplate):
args = []
return args"""
- def __init__(self, name, *args):
+ def __init__(self, name, *args, **kwargs):
# If the user provided `--name perl-cpp`, don't rename it perl-perl-cpp
if not name.startswith('perl-'):
# Make it more obvious that we are renaming the package
tty.msg("Changing package name from {0} to perl-{0}".format(name))
name = 'perl-{0}'.format(name)
- super(PerlmakePackageTemplate, self).__init__(name, *args)
+ super(PerlmakePackageTemplate, self).__init__(name, *args, **kwargs)
class PerlbuildPackageTemplate(PerlmakePackageTemplate):
@@ -333,7 +333,7 @@ class OctavePackageTemplate(PackageTemplate):
# FIXME: Add additional dependencies if required.
# depends_on('octave-foo', type=('build', 'run'))"""
- def __init__(self, name, *args):
+ def __init__(self, name, *args, **kwargs):
# If the user provided `--name octave-splines`, don't rename it
# octave-octave-splines
if not name.startswith('octave-'):
@@ -341,7 +341,7 @@ class OctavePackageTemplate(PackageTemplate):
tty.msg("Changing package name from {0} to octave-{0}".format(name)) # noqa
name = 'octave-{0}'.format(name)
- super(OctavePackageTemplate, self).__init__(name, *args)
+ super(OctavePackageTemplate, self).__init__(name, *args, **kwargs)
class MakefilePackageTemplate(PackageTemplate):
@@ -378,14 +378,14 @@ class SIPPackageTemplate(PackageTemplate):
args = []
return args"""
- def __init__(self, name, *args):
+ def __init__(self, name, *args, **kwargs):
# If the user provided `--name py-pyqt4`, don't rename it py-py-pyqt4
if not name.startswith('py-'):
# Make it more obvious that we are renaming the package
tty.msg("Changing package name from {0} to py-{0}".format(name))
name = 'py-{0}'.format(name)
- super(SIPPackageTemplate, self).__init__(name, *args)
+ super(SIPPackageTemplate, self).__init__(name, *args, **kwargs)
templates = {