summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2015-01-01 15:42:40 +0100
committerTim Graham <timograham@gmail.com>2015-01-05 14:52:54 -0500
commite08318b4ef25cfe7d1cfbc5ae7d134ee477506ba (patch)
tree197dda4767e182cf171ea19699465e535fb4ded6 /django
parent789baf9c3a432297ff775aee7f174494e4fd9962 (diff)
Refs #23359 -- Removed double newline from output of migrate --list
Thanks Berker Peksag for the review.
Diffstat (limited to 'django')
-rw-r--r--django/core/management/commands/migrate.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/core/management/commands/migrate.py b/django/core/management/commands/migrate.py
index df2d0ce026..8f414d38a0 100644
--- a/django/core/management/commands/migrate.py
+++ b/django/core/management/commands/migrate.py
@@ -68,14 +68,15 @@ class Command(BaseCommand):
warnings.warn(
"The 'migrate --list' command is deprecated. Use 'showmigrations' instead.",
RemovedInDjango20Warning, stacklevel=2)
+ self.stdout.ending = None # Remove when #21429 is fixed
return call_command(
'showmigrations',
'--list',
app_labels=[options['app_label']] if options['app_label'] else None,
database=db,
- no_color=options.get('no-color'),
+ no_color=options.get('no_color'),
settings=options.get('settings'),
- stdout=options.get('stdout', self.stdout),
+ stdout=self.stdout,
traceback=self.show_traceback,
verbosity=self.verbosity,
)