Typo

Fix additional_buildout_parametr_list to read
additional_buildout_parameter_list
parent e5ad44c2
...@@ -186,11 +186,11 @@ class Software(object): ...@@ -186,11 +186,11 @@ class Software(object):
utils.bootstrapBuildout(path=self.software_path, utils.bootstrapBuildout(path=self.software_path,
buildout=self.buildout, buildout=self.buildout,
logger=self.logger, logger=self.logger,
additional_buildout_parametr_list=buildout_parameter_list) additional_buildout_parameter_list=buildout_parameter_list)
utils.launchBuildout(path=self.software_path, utils.launchBuildout(path=self.software_path,
buildout_binary=os.path.join(self.software_path, 'bin', 'buildout'), buildout_binary=os.path.join(self.software_path, 'bin', 'buildout'),
logger=self.logger, logger=self.logger,
additional_buildout_parametr_list=buildout_parameter_list) additional_buildout_parameter_list=buildout_parameter_list)
finally: finally:
shutil.rmtree(extends_cache) shutil.rmtree(extends_cache)
......
...@@ -229,9 +229,9 @@ def dropPrivileges(uid, gid, logger): ...@@ -229,9 +229,9 @@ def dropPrivileges(uid, gid, logger):
def bootstrapBuildout(path, logger, buildout=None, def bootstrapBuildout(path, logger, buildout=None,
additional_buildout_parametr_list=None): additional_buildout_parameter_list=None):
if additional_buildout_parametr_list is None: if additional_buildout_parameter_list is None:
additional_buildout_parametr_list = [] additional_buildout_parameter_list = []
# Reads uid/gid of path, launches buildout with thoses privileges # Reads uid/gid of path, launches buildout with thoses privileges
stat_info = os.stat(path) stat_info = os.stat(path)
uid = stat_info.st_uid uid = stat_info.st_uid
...@@ -240,7 +240,7 @@ def bootstrapBuildout(path, logger, buildout=None, ...@@ -240,7 +240,7 @@ def bootstrapBuildout(path, logger, buildout=None,
invocation_list = [sys.executable, '-S'] invocation_list = [sys.executable, '-S']
if buildout is not None: if buildout is not None:
invocation_list.append(buildout) invocation_list.append(buildout)
invocation_list.extend(additional_buildout_parametr_list) invocation_list.extend(additional_buildout_parameter_list)
else: else:
try: try:
__import__('zc.buildout') __import__('zc.buildout')
...@@ -249,12 +249,12 @@ def bootstrapBuildout(path, logger, buildout=None, ...@@ -249,12 +249,12 @@ def bootstrapBuildout(path, logger, buildout=None,
'Consider having zc.buildout available in search path.') 'Consider having zc.buildout available in search path.')
invocation_list.append(pkg_resources.resource_filename(__name__, invocation_list.append(pkg_resources.resource_filename(__name__,
'zc.buildout-bootstap.py')) 'zc.buildout-bootstap.py'))
invocation_list.extend(additional_buildout_parametr_list) invocation_list.extend(additional_buildout_parameter_list)
else: else:
# buildout is importable, so use this one # buildout is importable, so use this one
invocation_list.extend(["-c", "import sys ; sys.path=" + str(sys.path) + invocation_list.extend(["-c", "import sys ; sys.path=" + str(sys.path) +
" ; import zc.buildout.buildout ; sys.argv[1:1]=" + " ; import zc.buildout.buildout ; sys.argv[1:1]=" +
repr(additional_buildout_parametr_list + ['bootstrap']) + " ; " repr(additional_buildout_parameter_list + ['bootstrap']) + " ; "
"zc.buildout.buildout.main()"]) "zc.buildout.buildout.main()"])
if buildout is not None: if buildout is not None:
...@@ -283,10 +283,10 @@ def bootstrapBuildout(path, logger, buildout=None, ...@@ -283,10 +283,10 @@ def bootstrapBuildout(path, logger, buildout=None,
def launchBuildout(path, buildout_binary, logger, def launchBuildout(path, buildout_binary, logger,
additional_buildout_parametr_list=None): additional_buildout_parameter_list=None):
""" Launches buildout.""" """ Launches buildout."""
if additional_buildout_parametr_list is None: if additional_buildout_parameter_list is None:
additional_buildout_parametr_list = [] additional_buildout_parameter_list = []
# Reads uid/gid of path, launches buildout with thoses privileges # Reads uid/gid of path, launches buildout with thoses privileges
stat_info = os.stat(path) stat_info = os.stat(path)
uid = stat_info.st_uid uid = stat_info.st_uid
...@@ -300,7 +300,7 @@ def launchBuildout(path, buildout_binary, logger, ...@@ -300,7 +300,7 @@ def launchBuildout(path, buildout_binary, logger,
invocation_list = line.split() + [buildout_binary] invocation_list = line.split() + [buildout_binary]
# Run buildout without reading user defaults # Run buildout without reading user defaults
invocation_list.append('-U') invocation_list.append('-U')
invocation_list.extend(additional_buildout_parametr_list) invocation_list.extend(additional_buildout_parameter_list)
try: try:
umask = os.umask(SAFE_UMASK) umask = os.umask(SAFE_UMASK)
logger.debug('Set umask from %03o to %03o' % (umask, SAFE_UMASK)) logger.debug('Set umask from %03o to %03o' % (umask, SAFE_UMASK))
......
...@@ -40,9 +40,9 @@ class FakeCallAndRead: ...@@ -40,9 +40,9 @@ class FakeCallAndRead:
self.external_command_list = [] self.external_command_list = []
def __call__(self, *args, **kwargs): def __call__(self, *args, **kwargs):
additional_buildout_parametr_list = \ additional_buildout_parameter_list = \
kwargs.get('additional_buildout_parametr_list') kwargs.get('additional_buildout_parameter_list')
self.external_command_list.extend(additional_buildout_parametr_list) self.external_command_list.extend(additional_buildout_parameter_list)
FakeCallAndRead = FakeCallAndRead() FakeCallAndRead = FakeCallAndRead()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment