Ticket #1436: management_error_messages.diff

django/core/management.py

@@ -501 +501 @@
     "Executes the equivalent of 'get_sql_all' in the current database."
     from django.db import connection, transaction
     from cStringIO import StringIO
-    app_name = app.__name__[app.__name__.rindex('.')+1:]
-    app_label = app_name.split('.')[-1]
+    app_name = app.__name__.split('.')[-2]
 
     # First, try validating the models.
     s = StringIO()
@@ -519 +518 @@
         for sql in sql_list:
             cursor.execute(sql)
     except Exception, e:
-        sys.stderr.write("""Error: %s couldn't be installed. Possible reasons:
+        sys.stderr.write("""Error: %(app_name)s couldn't be installed. Possible reasons:
   * The database isn't running or isn't configured correctly.
   * At least one of the database tables already exists.
   * The SQL was invalid.
-Hint: Look at the output of 'django-admin.py sqlall %s'. That's the SQL this command wasn't able to run.
-The full error: %s\n""" % \
-            (app_name, app_label, e))
+Hint: Look at the output of 'django-admin.py sqlall %(app_name)s'. That's the SQL this command wasn't able to run.
+The full error: %(e)s\n""" % \
+            locals())
         transaction.rollback_unless_managed()
         sys.exit(1)
     transaction.commit_unless_managed()
@@ -536 +535 @@
     "Executes the equivalent of 'get_sql_reset' in the current database."
     from django.db import connection, transaction
     from cStringIO import StringIO
-    app_name = app.__name__[app.__name__.rindex('.')+1:]
-    app_label = app_name.split('.')[-1]
+    app_name = app.__name__.split('.')[-2]
 
     # First, try validating the models.
     s = StringIO()
@@ -561 +559 @@
             for sql in sql_list:
                 cursor.execute(sql)
         except Exception, e:
-            sys.stderr.write("""Error: %s couldn't be installed. Possible reasons:
+            sys.stderr.write("""Error: %(app_name)s couldn't be installed. Possible reasons:
   * The database isn't running or isn't configured correctly.
   * At least one of the database tables already exists.
   * The SQL was invalid.
-Hint: Look at the output of 'django-admin.py sqlreset %s'. That's the SQL this command wasn't able to run.
-The full error: %s\n""" % \
-                (app_name, app_label, e))
+Hint: Look at the output of 'django-admin.py sqlreset %(app_name)s'. That's the SQL this command wasn't able to run.
+The full error: %(e)s\n""" % \
+                locals())
             transaction.rollback_unless_managed()
             sys.exit(1)
         transaction.commit_unless_managed()