Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Léo-Paul Géneau
slapos.core
Commits
6d7523e3
Commit
6d7523e3
authored
12 years ago
by
Antoine Catton
Browse files
Options
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
\
...
...
This diff is collapsed.
Click to expand it.
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