Commit 5e85de9e authored by Antoine Catton's avatar Antoine Catton

Revert "Fix environment passing for libattr and libcap"

This reverts commit 4f5a7f2c.
parent 79d58689
...@@ -148,14 +148,18 @@ class Software(object): ...@@ -148,14 +148,18 @@ class Software(object):
# XXX: Here's a Quick & Dirty hack, this was # XXX: Here's a Quick & Dirty hack, this was
# design to work as quick as possible with the most minimalist # design to work as quick as possible with the most minimalist
# impact. # 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. # XXX: This doesn't comes out of nowhere.
# actually, this is specified in component/slapos/buildout.cfg # actually, this is specified in component/slapos/buildout.cfg
# in slapos.cookbook repository. # in slapos.cookbook repository.
'libcap:location=%s' % os.environ.get('LIBCAP_LOCATION',''), 'libcap:location=%s' % environment.get('data', 'libcap-location'),
'attr:location=%s' % os.environ.get('ATTR_LOCATION',''), 'attr:location=%s' % environment.get('data', 'attr-location'),
] ]
if self.signature_private_key_file or \ if self.signature_private_key_file 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