Merge pull request #3821 from danxshap/django_venv_expand_user

Use home path expansion for virtualenv param in django_manage module
11 years ago · 9b09ff4a65
parent 4e5feb6322 4db4607ee5
commit 9b09ff4a65
1 changed files with 3 additions and 3 deletions
--- a/library/web_infrastructure/django_manage
+++ b/library/web_infrastructure/django_manage
@ -101,9 +101,9 @@ EXAMPLES = """

 #Run syncdb on the application
 - django_manage: >
-      command=syncdb 
+      command=syncdb
      app_path={{ django_dir }}
-      settings={{ settings_app_name }} 
+      settings={{ settings_app_name }}
      pythonpath={{ settings_dir }}
      virtualenv={{ virtualenv_dir }}

@ -131,7 +131,7 @@ def _ensure_virtualenv(module):

    virtualenv = module.get_bin_path('virtualenv', True)

-    vbin = os.path.join(venv_param, 'bin')
+    vbin = os.path.join(os.path.expanduser(venv_param), 'bin')
    activate = os.path.join(vbin, 'activate')

    if not os.path.exists(activate):