Commit 10613374 authored by Alain Takoudjou's avatar Alain Takoudjou

gilab-sr fixup: remove usage of z3c.recipe.scripts which doesn't work with buildout2

parent 3f4b983a
......@@ -39,6 +39,7 @@ parts =
python-4gitlab
gitlab-shell/vendor
gitlab/vendor/bundle
github-markup-patch
gitlab-workhorse
git-backup
......@@ -74,11 +75,7 @@ md5sum = 3cd1dca37be60668f482545716923b72
# python with eggs, that will be used in gitlab
[python-4gitlab]
# NOTE cannot use zc.recipe.egg - github-markup invoks `python2 -S` and
# interpreter generated by zc.recipe.egg cannot handle that.
recipe = z3c.recipe.scripts
# NOTE github-markup invokes it as `python2`, that's why we are naming it this way
# https://github.com/github/markup/blob/5393ae93/lib/github/markups.rb#L36
recipe = zc.recipe.egg
interpreter = python2
eggs =
docutils
......@@ -152,7 +149,20 @@ repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
revision = v0.7.1-5-gd23a3247829fc3200e3dc784dcd57b5a0febac48
location = ${buildout:parts-directory}/gitlab-workhorse
# Patch github markup to not call "python2 -S /path/to/rest2html" but only "python2 /path/to/rest2html"
# NOTE github-markup invokes it as `python2`, that's why we are naming it this way
# https://github.com/github/markup/blob/5393ae93/lib/github/markups.rb#L36
[github-markup-patch]
recipe = plone.recipe.command
command =
files=$(ls ${gitlab-repository:location}/vendor/bundle/ruby/*/gems/github-markup-*/lib/github/markups.rb) || true
if [ ! -z $files ]; then
for file in $files; do
sed -i 's#python2 -S#python2#' $file
done
fi
update-command = ${:command}
stop-on-error = True
# build needed-by-gitlab gems via bundler
[gitlab/vendor/bundle]
......
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