Commit 6d7523e3 authored by Antoine Catton's avatar Antoine Catton

Revert "Pass SlapOS libcap location during slapgrid-sr"

This reverts commit 5482692a.
parent 5e85de9e
...@@ -31,7 +31,6 @@ import logging ...@@ -31,7 +31,6 @@ import logging
import os import os
import shutil import shutil
import subprocess import subprocess
import ConfigParser
import pkg_resources import pkg_resources
import stat import stat
import tempfile import tempfile
...@@ -145,22 +144,9 @@ class Software(object): ...@@ -145,22 +144,9 @@ class Software(object):
os.chown(path, root_stat_info.st_uid, os.chown(path, root_stat_info.st_uid,
root_stat_info.st_gid) root_stat_info.st_gid)
try: try:
# XXX: Here's a Quick & Dirty hack, this was
# design to work as quick as possible with the most minimalist
# impact.
environment = ConfigParser.ConfigParser()
environment.read(os.path.join(self.software_path,
# XXX: hardcoded path
'../environment.cfg'))
buildout_parameter_list = [ buildout_parameter_list = [
'buildout:extends-cache=%s' % extends_cache, 'buildout:extends-cache=%s' % extends_cache,
'buildout:directory=%s' % self.software_path, 'buildout:directory=%s' % self.software_path,]
# XXX: This doesn't comes out of nowhere.
# actually, this is specified in component/slapos/buildout.cfg
# in slapos.cookbook repository.
'libcap:location=%s' % environment.get('data', 'libcap-location'),
'attr:location=%s' % environment.get('data', 'attr-location'),
]
if self.signature_private_key_file or \ if self.signature_private_key_file or \
self.upload_cache_url or \ self.upload_cache_url or \
......
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