Commit f66e8ea6 authored by Rafael Monnerat's avatar Rafael Monnerat

obs/slapos: No need to define setuptools version.

parent 1a7f17c1
...@@ -34,9 +34,7 @@ echo "$BUILD_ROOT_DIRECTORY" > $CURRENT_DIRECTORY/$SLAPOS_DIRECTORY/slapos/origi ...@@ -34,9 +34,7 @@ echo "$BUILD_ROOT_DIRECTORY" > $CURRENT_DIRECTORY/$SLAPOS_DIRECTORY/slapos/origi
wget https://bootstrap.pypa.io/bootstrap-buildout.py --no-check-certificate -O bootstrap.py wget https://bootstrap.pypa.io/bootstrap-buildout.py --no-check-certificate -O bootstrap.py
(python -S bootstrap.py --buildout-version $BUILDOUT_VERSION \ (python -S bootstrap.py --buildout-version $BUILDOUT_VERSION \
--setuptools-version $SETUPTOOL_VERSION \
--setuptools-to-dir eggs \ --setuptools-to-dir eggs \
-f http://www.nexedi.org/static/packages/source/ \
-f http://www.nexedi.org/static/packages/source/slapos.buildout/ && \ -f http://www.nexedi.org/static/packages/source/slapos.buildout/ && \
./bin/buildout -v) || (./bin/buildout -v || (echo "Failed to run buildout, exiting." && exit 1)) ./bin/buildout -v) || (./bin/buildout -v || (echo "Failed to run buildout, exiting." && exit 1))
...@@ -56,8 +54,7 @@ rm -rfv ./{downloads,parts,eggs,develop-eggs,bin,rebootstrap} ...@@ -56,8 +54,7 @@ rm -rfv ./{downloads,parts,eggs,develop-eggs,bin,rebootstrap}
find . -type d -empty -prune -exec rmdir '{}' ';' find . -type d -empty -prune -exec rmdir '{}' ';'
mkdir -p $BUILD_DIRECTORY/eggs mkdir -p $BUILD_DIRECTORY/eggs
python -S bootstrap.py --setuptools-version $SETUPTOOL_VERSION \ python -S bootstrap.py --buildout-version $BUILDOUT_VERSION \
--buildout-version $BUILDOUT_VERSION \
--setuptools-to-dir eggs \ --setuptools-to-dir eggs \
-f http://www.nexedi.org/static/packages/source/ \ -f http://www.nexedi.org/static/packages/source/ \
-f http://www.nexedi.org/static/packages/source/slapos.buildout/ -f http://www.nexedi.org/static/packages/source/slapos.buildout/
......
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