From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Tue, 8 Jun 2010 10:04:42 +0000 (+0200)
Subject: Use the right version of PIP.
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/4ee58649c86d9c4bd4ac89dd46325d0a1c443122?ds=sidebyside;hp=08d8018f613bad8e07c510fdecc7392c798de8b8

Use the right version of PIP.
---

diff --git a/deployment.py b/deployment.py
index 8f06d764..789d3425 100644
--- a/deployment.py
+++ b/deployment.py
@@ -25,6 +25,9 @@ class DeploySite(object):
             self.env['PYTHON_BIN'] = os.path.join(
                         self.env['PYTHON_BASE'], 'bin', 'python') + self.env['PYTHON_VERSION']
 
+        if 'PIP_BIN' not in self.env:
+            self.env['PIP_BIN'] = os.path.join(self.env['PYTHON_BASE'], 'bin', 'pip')
+
         if 'PYTHON_SITE' not in self.env:
             self.env['PYTHON_SITE'] = os.path.join(
                         self.env['PYTHON_BASE'], 'lib',
@@ -113,11 +116,11 @@ class PIPSite(DeploySite):
 
     def install_dependencies(self):
         self.info("Installing requirements")
-        os.system("pip install -r %s" % self.find_resource('requirements.txt'))
+        os.system("%s install -r %s" % (self.env['PIP_BIN'], self.find_resource('requirements.txt')))
 
         try:
             self.info("Installing local requirements")
-            os.system("pip install -r %s" % self.find_resource('requirements_local.txt'))
+            os.system("%s install -r %s" % (self.env['PIP_BIN'], self.find_resource('requirements_local.txt')))
         except ValueError:
             pass