From 058ccf2abcb15ec939f27947e9cc2b3011455313 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Fri, 22 Feb 2013 05:52:53 +0000
Subject: [PATCH] Install pyzmq from pip after salt being installed. Override
 current pyzmq.

---
 bootstrap-salt.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 151d457..9585d33 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -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
 }