Commit 7a1ba8df authored by Julien Muchembled's avatar Julien Muchembled

NEO: extend the 'neoppod' recipes to support extra environment variables

This will be used to add the sqlite3 binary directory to PATH.

See nexedi/neoppod@5923f8f5
parent c7f620fc
Pipeline #34577 failed with stage
in 0 seconds
...@@ -89,9 +89,17 @@ class NeoBaseRecipe(GenericBaseRecipe): ...@@ -89,9 +89,17 @@ class NeoBaseRecipe(GenericBaseRecipe):
) )
args += self._getOptionList() args += self._getOptionList()
args += shlex.split(options.get('extra-options', '')) args += shlex.split(options.get('extra-options', ''))
environment = {}
for line in (options.get('environment') or '').splitlines():
line = line.strip()
if line:
k, v = line.split('=', 1)
environment[k.rstrip()] = v.lstrip()
private_tmpfs = self.parsePrivateTmpfs() private_tmpfs = self.parsePrivateTmpfs()
kw = {'private_tmpfs': private_tmpfs} if private_tmpfs else {} kw = {'private_tmpfs': private_tmpfs} if private_tmpfs else {}
return self.createWrapper(options['wrapper'], args, **kw) return self.createWrapper(options['wrapper'], args, env=environment, **kw)
def _getBindingAddress(self): def _getBindingAddress(self):
options = self.options options = self.options
......
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