Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
slapos.toolbox
Commits
674ad139
Commit
674ad139
authored
Sep 13, 2013
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix : the slapos repo couldn't be downloaded if no user had registered
parent
0f38ef39
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
7 deletions
+3
-7
__init__.py
slapos/runner/__init__.py
+1
-1
utils.py
slapos/runner/utils.py
+2
-6
No files found.
slapos/runner/__init__.py
View file @
674ad139
...
@@ -150,9 +150,9 @@ def serve(config):
...
@@ -150,9 +150,9 @@ def serve(config):
os
.
mkdir
(
workdir
)
os
.
mkdir
(
workdir
)
if
not
os
.
path
.
exists
(
software_link
):
if
not
os
.
path
.
exists
(
software_link
):
os
.
mkdir
(
software_link
)
os
.
mkdir
(
software_link
)
cloneDefaultGit
(
app
.
config
)
slapos
.
runner
.
process
.
setHandler
()
slapos
.
runner
.
process
.
setHandler
()
config
.
logger
.
info
(
'Running slapgrid...'
)
config
.
logger
.
info
(
'Running slapgrid...'
)
cloneDefaultGit
(
app
.
config
)
runInstanceWithLock
(
app
.
config
)
runInstanceWithLock
(
app
.
config
)
config
.
logger
.
info
(
'Done.'
)
config
.
logger
.
info
(
'Done.'
)
app
.
wsgi_app
=
ProxyFix
(
app
.
wsgi_app
)
app
.
wsgi_app
=
ProxyFix
(
app
.
wsgi_app
)
...
...
slapos/runner/utils.py
View file @
674ad139
...
@@ -809,13 +809,9 @@ def cloneDefaultGit(config):
...
@@ -809,13 +809,9 @@ def cloneDefaultGit(config):
"""Test if the slapos git has been downloaded yet
"""Test if the slapos git has been downloaded yet
If not, download it in read-only mode"""
If not, download it in read-only mode"""
slap
=
os
.
path
.
join
(
config
[
'runner_workdir'
],
'project'
,
'slapos'
)
slap
=
os
.
path
.
join
(
config
[
'runner_workdir'
],
'project'
,
'slapos'
)
slap_ro
=
os
.
path
.
join
(
config
[
'runner_workdir'
],
'project'
,
'slapos-readonly'
)
if
not
os
.
path
.
exists
(
slap
):
if
not
os
.
path
.
exists
(
slap_ro
)
or
not
os
.
path
.
exists
(
slap_ro
):
from
gittools
import
cloneRepo
from
gittools
import
cloneRepo
user
=
getSession
(
config
)
data
=
{
'path'
:
slap
,
data
=
{
'path'
:
slap_ro
,
'repo'
:
'http://git.erp5.org/repos/slapos.git'
,
'repo'
:
'http://git.erp5.org/repos/slapos.git'
,
'email'
:
user
[
2
],
'user'
:
user
[
3
],
}
}
cloneRepo
(
data
)
cloneRepo
(
data
)
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