Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
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
Arnaud Véron
slapos.package
Commits
ed735991
Commit
ed735991
authored
Jun 29, 2020
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
re6st: rename [python] to fix conflict with section of same name in recent slapos
See also
nexedi/slapos!720
parent
722f0e8d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
obs/re6st/buildout.cfg.in
obs/re6st/buildout.cfg.in
+3
-3
obs/re6st/make.py
obs/re6st/make.py
+1
-1
No files found.
obs/re6st/buildout.cfg.in
View file @
ed735991
...
@@ -13,7 +13,7 @@ newest = false
...
@@ -13,7 +13,7 @@ newest = false
allow-picked-versions = true
allow-picked-versions = true
parts += chrpath python
parts += chrpath python
-bootstrap
[babeld-repository]
[babeld-repository]
git-executable =
git-executable =
...
@@ -22,9 +22,9 @@ location = ${buildout:directory}/babeld
...
@@ -22,9 +22,9 @@ location = ${buildout:directory}/babeld
[babeld]
[babeld]
post-install = make clean
post-install = make clean
[python]
[python
-bootstrap
]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
interpreter =
${:_buildout_section_name_}
.tmp
interpreter =
python
.tmp
eggs = slapos.libnetworkcache
eggs = slapos.libnetworkcache
# https://lab.nexedi.com/nexedi/slapos.buildout/merge_requests/11
# https://lab.nexedi.com/nexedi/slapos.buildout/merge_requests/11
scripts = dummy
scripts = dummy
...
...
obs/re6st/make.py
View file @
ed735991
...
@@ -96,7 +96,7 @@ def bootstrap(task):
...
@@ -96,7 +96,7 @@ def bootstrap(task):
# we'll have the wanted version in cache.
# we'll have the wanted version in cache.
"--setuptools-version"
,
"33.1.0"
),
input
=
bootstrap
)
"--setuptools-version"
,
"33.1.0"
),
input
=
bootstrap
)
check_call
((
"bin/buildout"
,
"buildout:extensions="
,
check_call
((
"bin/buildout"
,
"buildout:extensions="
,
"buildout:newest=true"
,
"buildout:parts=python"
))
"buildout:newest=true"
,
"buildout:parts=python
-bootstrap
"
))
check_call
((
"bin/python.tmp"
,
"bin/buildout"
,
"bootstrap"
))
check_call
((
"bin/python.tmp"
,
"bin/buildout"
,
"bootstrap"
))
os
.
rename
(
"bin/python.tmp"
,
"bin/python"
)
os
.
rename
(
"bin/python.tmp"
,
"bin/python"
)
...
...
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