mirror of https://github.com/django/django.git
Fixed #2932 -- Added more details to the warning message in 'manage.py reset'. Thanks for the patch, pb@e-scribe.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
60b46d72ac
commit
3536f89108
|
@ -540,7 +540,7 @@ def syncdb(verbosity=1, interactive=True):
|
||||||
transaction.rollback_unless_managed()
|
transaction.rollback_unless_managed()
|
||||||
else:
|
else:
|
||||||
transaction.commit_unless_managed()
|
transaction.commit_unless_managed()
|
||||||
|
|
||||||
syncdb.args = ''
|
syncdb.args = ''
|
||||||
|
|
||||||
def get_admin_index(app):
|
def get_admin_index(app):
|
||||||
|
@ -627,6 +627,7 @@ install.args = APP_ARGS
|
||||||
def reset(app, interactive=True):
|
def reset(app, interactive=True):
|
||||||
"Executes the equivalent of 'get_sql_reset' in the current database."
|
"Executes the equivalent of 'get_sql_reset' in the current database."
|
||||||
from django.db import connection, transaction
|
from django.db import connection, transaction
|
||||||
|
from django.conf import settings
|
||||||
app_name = app.__name__.split('.')[-2]
|
app_name = app.__name__.split('.')[-2]
|
||||||
|
|
||||||
disable_termcolors()
|
disable_termcolors()
|
||||||
|
@ -638,13 +639,14 @@ def reset(app, interactive=True):
|
||||||
if interactive:
|
if interactive:
|
||||||
confirm = raw_input("""
|
confirm = raw_input("""
|
||||||
You have requested a database reset.
|
You have requested a database reset.
|
||||||
This will IRREVERSIBLY DESTROY any data in your database.
|
This will IRREVERSIBLY DESTROY any data for
|
||||||
|
the "%s" application in the database "%s".
|
||||||
Are you sure you want to do this?
|
Are you sure you want to do this?
|
||||||
|
|
||||||
Type 'yes' to continue, or 'no' to cancel: """)
|
Type 'yes' to continue, or 'no' to cancel: """ % (app_name, settings.DATABASE_NAME))
|
||||||
else:
|
else:
|
||||||
confirm = 'yes'
|
confirm = 'yes'
|
||||||
|
|
||||||
if confirm == 'yes':
|
if confirm == 'yes':
|
||||||
try:
|
try:
|
||||||
cursor = connection.cursor()
|
cursor = connection.cursor()
|
||||||
|
|
Loading…
Reference in New Issue