Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
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
Thomas Leymonerie
slapos.toolbox
Commits
8480dbe6
Commit
8480dbe6
authored
Sep 16, 2013
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
The new parameter default_repo is more generic.
The git repo slapos is not hardcoded anymore
parent
6e4cf8c3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
slapos/runner/utils.py
slapos/runner/utils.py
+7
-6
No files found.
slapos/runner/utils.py
View file @
8480dbe6
...
@@ -15,6 +15,8 @@ from xml.dom import minidom
...
@@ -15,6 +15,8 @@ from xml.dom import minidom
import
xml_marshaller
import
xml_marshaller
from
flask
import
jsonify
from
flask
import
jsonify
from
gittools
import
cloneRepo
from
slapos.runner.process
import
Popen
,
isRunning
,
killRunningProcess
from
slapos.runner.process
import
Popen
,
isRunning
,
killRunningProcess
from
slapos.htpasswd
import
HtpasswdFile
from
slapos.htpasswd
import
HtpasswdFile
import
slapos.slap
import
slapos.slap
...
@@ -806,13 +808,12 @@ def readParameters(path):
...
@@ -806,13 +808,12 @@ def readParameters(path):
def cloneDefaultGit(config):
def cloneDefaultGit(config):
"""Test if the
slapos
git has been downloaded yet
"""Test if the
default
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
')
default_git = os.path.join(config['
runner_workdir
'], '
project
', '
default_repo
')
if not os.path.exists(slap):
if not os.path.exists(default_git):
from gittools import cloneRepo
data = {'
path
': default_git,
data = {'
path
': slap,
'
repo
': config['
default_repo
'],
'
repo
': '
http
:
//
git
.
erp5
.
org
/
repos
/
slapos
.
git
',
}
}
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