From 2fe74b3d2714bb45cc0b41cfd157c0e6441c92a7 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sun, 28 Feb 2016 22:04:20 -0500
Subject: [PATCH] Pin virtualenv pip package to pin installed binary

A recent update of the virtualenv package changed the installed
binaries from `virtualenv` and `virtualenv-3.4`, to `virtualenv` and
`virtualenv-3.5`, breaking the homu installation which needs a python3
version of virtualenv. Pin the package to the newest version and update
the homu installation to use the virtualenv-3.5 binary.

Note: the python3 apt package still installs python3.4, but the version
difference should be ok since virtualenv is just used to install homu,
not run it.
---
 common/init.sls | 5 +++--
 homu/init.sls   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/init.sls b/common/init.sls
index 25a353eb..218538af 100644
--- a/common/init.sls
+++ b/common/init.sls
@@ -22,11 +22,12 @@ pip:
       {% endif %}
     - reload_modules: True
 
-# Virtualenv package creates virtualenv and virtualenv-3.4 executables
+# virtualenv == 14.0.6 package creates virtualenv and virtualenv-3.5 executables
+# note that the version of the second may change between virtualenv versions
 virtualenv:
   pip.installed:
     - pkgs:
-      - virtualenv
+      - virtualenv == 14.0.6
     - require:
       - pkg: pip
 
diff --git a/homu/init.sls b/homu/init.sls
index 01ce440c..0a2fa161 100644
--- a/homu/init.sls
+++ b/homu/init.sls
@@ -11,7 +11,7 @@ homu:
     - user: servo
   virtualenv.managed:
     - name: /home/servo/homu/_venv
-    - venv_bin: virtualenv-3.4
+    - venv_bin: virtualenv-3.5
     - python: python3
     - system_site_packages: False
     - require: