From 6a13a3aa9753c82a76d4f7e2f8291c1f6cb04f80 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Tue, 5 May 2015 19:18:13 +0000
Subject: [PATCH] Sync charm-helpers

---
 hooks/charmhelpers/contrib/openstack/utils.py |  8 +++++++-
 hooks/charmhelpers/contrib/python/packages.py | 19 ++++++++++++++++++-
 hooks/charmhelpers/fetch/giturl.py            |  4 ++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/hooks/charmhelpers/contrib/openstack/utils.py b/hooks/charmhelpers/contrib/openstack/utils.py
index b47ed937..ce8c8213 100644
--- a/hooks/charmhelpers/contrib/openstack/utils.py
+++ b/hooks/charmhelpers/contrib/openstack/utils.py
@@ -53,9 +53,13 @@ from charmhelpers.contrib.network.ip import (
     get_ipv6_addr
 )
 
+from charmhelpers.contrib.python.packages import (
+    pip_create_virtualenv,
+    pip_install,
+)
+
 from charmhelpers.core.host import lsb_release, mounts, umount
 from charmhelpers.fetch import apt_install, apt_cache, install_remote
-from charmhelpers.contrib.python.packages import pip_install
 from charmhelpers.contrib.storage.linux.utils import is_block_device, zap_disk
 from charmhelpers.contrib.storage.linux.loopback import ensure_loopback_device
 
@@ -536,6 +540,8 @@ def git_clone_and_install(projects_yaml, core_project, depth=1):
     if 'directory' in projects.keys():
         parent_dir = projects['directory']
 
+    pip_create_virtualenv(proxy=http_proxy)
+
     for p in projects['repositories']:
         repo = p['repository']
         branch = p['branch']
diff --git a/hooks/charmhelpers/contrib/python/packages.py b/hooks/charmhelpers/contrib/python/packages.py
index 3f1fb09d..e62240b4 100644
--- a/hooks/charmhelpers/contrib/python/packages.py
+++ b/hooks/charmhelpers/contrib/python/packages.py
@@ -17,8 +17,11 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
+import subprocess
+
 from charmhelpers.fetch import apt_install, apt_update
-from charmhelpers.core.hookenv import log
+from charmhelpers.core.hookenv import charm_dir, log
 
 try:
     from pip import main as pip_execute
@@ -94,3 +97,17 @@ def pip_list():
     """Returns the list of current python installed packages
     """
     return pip_execute(["list"])
+
+
+def pip_create_virtualenv(parent_dir=charm_dir(), proxy=None):
+    """Create and activate an isolated Python environment (virtualenv)."""
+    if proxy:
+        pip_install('virtualenv', proxy=proxy)
+    else:
+        pip_install('virtualenv')
+
+    venv_dir = os.path.join(parent_dir, 'venv')
+    subprocess.check_call(['virtualenv', '--no-site-packages', venv_dir])
+
+    venv_activate = os.path.join(venv_dir, 'bin/activate')
+    subprocess.check_call(['.', venv_activate], shell=True)
diff --git a/hooks/charmhelpers/fetch/giturl.py b/hooks/charmhelpers/fetch/giturl.py
index 4e05c08a..7d842d49 100644
--- a/hooks/charmhelpers/fetch/giturl.py
+++ b/hooks/charmhelpers/fetch/giturl.py
@@ -50,9 +50,9 @@ class GitUrlFetchHandler(BaseFetchHandler):
             raise UnhandledSource("Cannot handle {}".format(source))
 
         if depth:
-            repo = Repo.clone_from(source, dest, branch=branch, depth=depth)
+            Repo.clone_from(source, dest, branch=branch, depth=depth)
         else:
-            repo = Repo.clone_from(source, dest, branch=branch)
+            Repo.clone_from(source, dest, branch=branch)
 
     def install(self, source, branch="master", dest=None, depth=None):
         url_parts = self.parse_url(source)