Skip to content

slapos-caddy
slapos-caddy
Commit 9b1e5de2 authored by Antoine Catton's avatar Antoine Catton
Browse files
Options

Revert "Fix environment passing" 

This reverts commit 14bf54b1.
parent ba753da6
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
component/slapos/buildout.cfg
View file @ 9b1e5de2
...@@ -69,6 +69,9 @@ input = inline: ...@@ -69,6 +69,9 @@ input = inline:
LDFLAGS=${environment:LDFLAGS} LDFLAGS=${environment:LDFLAGS}
PKG_CONFIG_PATH=${environment:PKG_CONFIG_PATH} PKG_CONFIG_PATH=${environment:PKG_CONFIG_PATH}
LD_LIBRARY_PATH=${environment:LD_LIBRARY_PATH} LD_LIBRARY_PATH=${environment:LD_LIBRARY_PATH}
[data]
libcap-location=${libcap:location}
attr-location:${attr:location}
output = ${buildout:directory}/environment.cfg output = ${buildout:directory}/environment.cfg
[sh-environment] [sh-environment]
...@@ -99,8 +102,6 @@ eggs = ...@@ -99,8 +102,6 @@ eggs =
initialization = initialization =
import os import os
os.environ['PATH'] = os.path.expandvars('${environment:PATH}') os.environ['PATH'] = os.path.expandvars('${environment:PATH}')
os.environ['LIBCAP_LOCATION'] = '${libcap:location}'
os.environ['ATTR_LOCATION'] = '${attr:location}'
# control scripts generation in order to avoid reinstalling bin/buildout # control scripts generation in order to avoid reinstalling bin/buildout
scripts = scripts =
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7