Commit fbf207fc authored by Marco Mariani's avatar Marco Mariani

pass extra parameters through the wrapper

parent e6b93ecf
...@@ -154,6 +154,7 @@ class BaseSlapRecipe: ...@@ -154,6 +154,7 @@ class BaseSlapRecipe:
self._writeExecutable(wrapper_path, file_content) self._writeExecutable(wrapper_path, file_content)
return wrapper_path return wrapper_path
# XXX methinks the following method is unused / obsolete.
def createReportRunningWrapper(self, file_content): def createReportRunningWrapper(self, file_content):
"""Creates report runnig wrapper and returns its path""" """Creates report runnig wrapper and returns its path"""
report_wrapper_path = os.path.join(self.wrapper_report_directory, report_wrapper_path = os.path.join(self.wrapper_report_directory,
......
...@@ -127,7 +127,7 @@ class GenericBaseRecipe(object): ...@@ -127,7 +127,7 @@ class GenericBaseRecipe(object):
path, arguments=arguments)[0] path, arguments=arguments)[0]
return script return script
def createWrapper(self, name, command, parameters, comments=[]): def createWrapper(self, name, command, parameters, comments=[], parameters_extra=False):
""" """
Creates a very simple (one command) shell script for process replacement. Creates a very simple (one command) shell script for process replacement.
Takes care of quoting. Takes care of quoting.
...@@ -141,12 +141,17 @@ class GenericBaseRecipe(object): ...@@ -141,12 +141,17 @@ class GenericBaseRecipe(object):
lines.append('exec %s' % shlex.quote(command)) lines.append('exec %s' % shlex.quote(command))
for param in parameters: for param in parameters:
if len(lines[-1]) < 30: if len(lines[-1]) < 40:
lines[-1] += ' ' + shlex.quote(param) lines[-1] += ' ' + shlex.quote(param)
else: else:
lines[-1] += ' \\' lines[-1] += ' \\'
lines.append('\t' + shlex.quote(param)) lines.append('\t' + shlex.quote(param))
if parameters_extra:
# pass-through further parameters
lines[-1] += ' \\'
lines.append('\t$@')
content = '\n'.join(lines) + '\n' content = '\n'.join(lines) + '\n'
return self.createFile(name, content, 0700) return self.createFile(name, content, 0700)
......
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