Commit ac353e1b authored by Chris Burr's avatar Chris Burr
Browse files

Merge branch 'cburr-lbenv-py3k-all-flavours' into 'master'

Use host_os_conda for platform detection on all flavours

See merge request !21
parents 34b944fa a449457a
Pipeline #2034884 passed with stages
in 1 minute and 3 seconds
......@@ -41,12 +41,7 @@ for flavour in stable testing unstable ; do
tgt=${RPM_BUILD_ROOT}/%{prefix}/LbEnv-${flavour}${suff}
install -m 0644 "data/LbEnv-flavour${suff}" "${tgt}"
sed -i "s/%flavour%/${flavour}/g" "${tgt}"
# TODO: These should all be moved over to host_os_conda eventually
if [ "${flavour}" = "unstable" ]; then
host_os_script_fn=host_os_conda
else
host_os_script_fn=host_os
fi
host_os_script_fn=host_os_conda
sed -i "s/%host_os_script_fn%/${host_os_script_fn}/g" "${tgt}"
done
done
......
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