summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-02-13 18:14:36 +0100
committerClaude Paroz <claude@2xlibre.net>2016-02-23 09:12:12 +0100
commitb46c0ea6c87f006f9ef0ccc5d8c0fa2445fb4156 (patch)
treeb2ad02486c71376062e637b21272f40b24bf56e9 /django
parent47b5a6a43c400619ca471de02e9f5fcc9f30d8bf (diff)
Fixed #26190 -- Returned handle() result from call_command
Thanks Tim Graham for the review.
Diffstat (limited to 'django')
-rw-r--r--django/core/management/base.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/django/core/management/base.py b/django/core/management/base.py
index ce9ba0be48..9434691ccb 100644
--- a/django/core/management/base.py
+++ b/django/core/management/base.py
@@ -348,18 +348,17 @@ class BaseCommand(object):
output = self.handle(*args, **options)
if output:
if self.output_transaction:
- # This needs to be imported here, because it relies on
- # settings.
- from django.db import connections, DEFAULT_DB_ALIAS
connection = connections[options.get('database', DEFAULT_DB_ALIAS)]
- if connection.ops.start_transaction_sql():
- self.stdout.write(self.style.SQL_KEYWORD(connection.ops.start_transaction_sql()))
+ output = '%s\n%s\n%s' % (
+ self.style.SQL_KEYWORD(connection.ops.start_transaction_sql()),
+ output,
+ self.style.SQL_KEYWORD(connection.ops.end_transaction_sql()),
+ )
self.stdout.write(output)
- if self.output_transaction:
- self.stdout.write('\n' + self.style.SQL_KEYWORD(connection.ops.end_transaction_sql()))
finally:
if saved_locale is not None:
translation.activate(saved_locale)
+ return output
def check(self, app_configs=None, tags=None, display_num_errors=False,
include_deployment_checks=False, fail_level=checks.ERROR):