Add quick support for PATH in non-standard location

parent 0d3f1c4e
No related merge requests found
......@@ -24,6 +24,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import os
import shutil
from slapos.recipe.librecipe import GenericSlapRecipe
from subprocess import Popen
......@@ -79,7 +80,10 @@ class Recipe(GenericSlapRecipe):
server_url = self.server_url,
software_release_url = self.software_release_url,
key_file = self.key_file,
cert_file = self.cert_file,)
cert_file = self.cert_file,
path = '%s:%s' % (self.options['accords_bin_directory'],
os.environ.get('PATH', '')),
)
wrapper_location = self.createPythonScript(self.options['accords-wrapper'],
'%s.accords.runAccords' % __name__,
wrapper_config_dict)
......
......@@ -26,6 +26,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import os
from slapos import slap
import signal
from subprocess import Popen
......@@ -48,6 +49,7 @@ def runAccords(accords_conf):
environment = dict(
LD_LIBRARY_PATH=accords_lib_directory,
PATH= accords_conf['path'],
)
# Set handler to stop ACCORDS when end of world comes
......
......@@ -5,8 +5,6 @@ extends =
../../component/lxml-python/buildout.cfg
../slapos.cfg
versions = versions
parts =
instance
instance-accords
......@@ -35,10 +33,6 @@ url = ${:_profile_base_location_}/instance-accords.cfg
output = ${buildout:directory}/template-accords.cfg
mode = 0644
[versions]
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-004
[networkcache]
# Cedric de Saint Martin signature certificate
signature-certificate-list =
......
......@@ -32,6 +32,7 @@ manifest-name = manifest
accords-wrapper = $${basedirectory:services}/accords
# Workaround
accords_lib_directory : ${accords:location}/lib
accords_bin_directory : ${accords:location}/bin
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
......
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