Install pyzmq from pip after salt being installed. Override current pyzmq.

This commit is contained in:
Pedro Algarvio 2013-02-22 05:52:53 +00:00
parent f5a09bf7f9
commit 058ccf2abc

View file

@ -939,8 +939,6 @@ _eof
apt-get update
apt-get install -t experimental libzmq3 libzmq3-dev
apt-get install build-essential python-dev
# Building pyzmq from source to build it against libzmq3
pip install pyzmq
}
install_debian_git_deps() {
@ -948,6 +946,9 @@ install_debian_git_deps() {
__apt_get_noinput lsb-release python python-pkg-resources python-crypto \
python-jinja2 python-m2crypto python-yaml msgpack-python git
# Building pyzmq from source to build it against libzmq3
pip install pyzmq
__git_clone_and_checkout
# Let's trigger config_salt()
@ -974,6 +975,10 @@ install_debian_stable() {
packages="${packages} salt-syndic"
fi
__apt_get_noinput ${packages}
# Building pyzmq from source to build it against libzmq3.
# Should override current installation
pip install -U pyzmq
}