From b46c0ea6c87f006f9ef0ccc5d8c0fa2445fb4156 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sat, 13 Feb 2016 18:14:36 +0100 Subject: Fixed #26190 -- Returned handle() result from call_command Thanks Tim Graham for the review. --- django/core/management/base.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'django') 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): -- cgit v1.3