Merge pull request #3821 from danxshap/django_venv_expand_user

Use home path expansion for virtualenv param in django_manage module
This commit is contained in:
Michael DeHaan 2013-08-11 17:53:01 -07:00
commit b5696d674e

View file

@ -101,9 +101,9 @@ EXAMPLES = """
#Run syncdb on the application #Run syncdb on the application
- django_manage: > - django_manage: >
command=syncdb command=syncdb
app_path={{ django_dir }} app_path={{ django_dir }}
settings={{ settings_app_name }} settings={{ settings_app_name }}
pythonpath={{ settings_dir }} pythonpath={{ settings_dir }}
virtualenv={{ virtualenv_dir }} virtualenv={{ virtualenv_dir }}
@ -131,7 +131,7 @@ def _ensure_virtualenv(module):
virtualenv = module.get_bin_path('virtualenv', True) 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') activate = os.path.join(vbin, 'activate')
if not os.path.exists(activate): if not os.path.exists(activate):