Commit e0bf4bcc authored by Killian Lufau's avatar Killian Lufau Committed by Julien Muchembled

fixup! re6st: prepare OBS package using slapos.libnetworkcache

Commit c5e509c3
added the ability to download from network cache when building re6st,
but slapos.libnetworkcache is imported after bin/buildout has
already been generated. The fixup consists of adding libnetworkcache
in bin/buildout from bin/python, which has been renamed to
bin/python.temp until the end of bootstrap to start again if we fail
before the end of the task.

/reviewed-on nexedi/slapos.package!90
parent c05ad416
...@@ -17,7 +17,7 @@ parts += chrpath python ...@@ -17,7 +17,7 @@ parts += chrpath python
[python] [python]
recipe = zc.recipe.egg recipe = zc.recipe.egg
interpreter = ${:_buildout_section_name_} interpreter = ${:_buildout_section_name_}.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
......
...@@ -97,6 +97,8 @@ def bootstrap(task): ...@@ -97,6 +97,8 @@ def bootstrap(task):
"--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"))
check_call(("bin/python.tmp", "bin/buildout", "bootstrap"))
os.rename("bin/python.tmp", "bin/python")
def sdist_version(egg): def sdist_version(egg):
global MTIME, VERSION global MTIME, VERSION
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment