Skip to content

Commit

Permalink
change execution to use django-admin instead of manage.py
Browse files Browse the repository at this point in the history
  • Loading branch information
bretth committed Dec 19, 2010
1 parent 81f9144 commit fff5f59
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions woven/virtualenv.py
Expand Up @@ -126,8 +126,8 @@ def sync_db():
for settings_file in _sitesettings_files():
site_settings = '.'.join([env.project_package_name,'sitesettings',settings_file.replace('.py','')])
if env.verbosity:
print " * python manage.py syncdb --noinput --settings=%s"% site_settings
output = sudo(' '.join(['source',venv,'&&',"./manage.py syncdb --noinput --settings=%s"% site_settings]),
print " * django-admin.py syncdb --noinput --settings=%s"% site_settings
output = sudo(' '.join(['source',venv,'&&',"django-admin.py syncdb --noinput --settings=%s"% site_settings]),
user='site_%s'% site)
if env.verbosity:
print output
Expand Down Expand Up @@ -169,7 +169,7 @@ def migration():
for site in site_ids:
for settings_file in _sitesettings_files():
site_settings = '.'.join([env.project_package_name,'sitesettings',settings_file.replace('.py','')])
cmdpt2 = ' '.join(["python manage.py migrate",env.migration])
cmdpt2 = ' '.join(["django-admin.py migrate",env.migration])
if hasattr(env,"fakemigration"):
cmdpt2 = ' '.join([cmdpt2,'--fake'])
cmdpt2 = ''.join([cmdpt2,'--settings=',site_settings])
Expand Down
2 changes: 1 addition & 1 deletion woven/webservers.py
Expand Up @@ -129,7 +129,7 @@ def _get_django_sites():
#since this is the first time we run ./manage.py on the server it can be
#a point of failure for installations
with settings(warn_only=True):
output = run(' '.join(['source',venv,'&&',"./manage.py dumpdata sites"]))
output = run(' '.join(['source',venv,'&&',"django-admin.py dumpdata sites --settings=%s.sitesettings.settings"% env.project_package_name]))

if output.failed:
print "ERROR: There was an error running ./manage.py on the node"
Expand Down

0 comments on commit fff5f59

Please sign in to comment.