Merge pull request #5323 from zroger/django-manage-virtualenv-fix

django_manage module: need not require virtualenv in PATH
11 years ago · 48cebedae1
parent a6bc63512e a3dcac0a0f
commit 48cebedae1
1 changed files with 1 additions and 2 deletions
--- a/library/web_infrastructure/django_manage
+++ b/library/web_infrastructure/django_manage
@ -129,12 +129,11 @@ def _ensure_virtualenv(module):
    if venv_param is None:
        return

-    virtualenv = module.get_bin_path('virtualenv', True)
-
    vbin = os.path.join(os.path.expanduser(venv_param), 'bin')
    activate = os.path.join(vbin, 'activate')

    if not os.path.exists(activate):
+        virtualenv = module.get_bin_path('virtualenv', True)
        vcmd = '%s %s' % (virtualenv, venv_param)
        vcmd = [virtualenv, venv_param]
        rc, out_venv, err_venv = module.run_command(vcmd)