Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Thompson
slapos.core
Commits
5e85de9e
Commit
5e85de9e
authored
Aug 21, 2012
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fix environment passing for libattr and libcap"
This reverts commit
4f5a7f2c
.
parent
79d58689
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
slapos/grid/SlapObject.py
slapos/grid/SlapObject.py
+6
-2
No files found.
slapos/grid/SlapObject.py
View file @
5e85de9e
...
@@ -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
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment