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
Eric Zheng
slapos.core
Commits
6d7523e3
Commit
6d7523e3
authored
Aug 21, 2012
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Pass SlapOS libcap location during slapgrid-sr"
This reverts commit
5482692a
.
parent
5e85de9e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
15 deletions
+1
-15
slapos/grid/SlapObject.py
slapos/grid/SlapObject.py
+1
-15
No files found.
slapos/grid/SlapObject.py
View file @
6d7523e3
...
...
@@ -31,7 +31,6 @@ import logging
import
os
import
shutil
import
subprocess
import
ConfigParser
import
pkg_resources
import
stat
import
tempfile
...
...
@@ -145,22 +144,9 @@ class Software(object):
os
.
chown
(
path
,
root_stat_info
.
st_uid
,
root_stat_info
.
st_gid
)
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:extends-cache=%s'
%
extends_cache
,
'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'
),
]
'buildout:directory=%s'
%
self
.
software_path
,]
if
self
.
signature_private_key_file
or
\
self
.
upload_cache_url
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