innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #26150 -- Sorted app_labels in migrate command output

This commit is contained in:
Markus Holtermann 2016-01-28 17:52:00 +11:00
parent 19d1cb1451
commit 4b0118465b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/management/commands/migrate.py
View File

@ -122,12 +122,12 @@ class Command(BaseCommand):
if run_syncdb: if run_syncdb:
self.stdout.write( self.stdout.write(
self.style.MIGRATE_LABEL(" Synchronize unmigrated apps: ") + self.style.MIGRATE_LABEL(" Synchronize unmigrated apps: ") +
(", ".join(executor.loader.unmigrated_apps)) (", ".join(sorted(executor.loader.unmigrated_apps)))
) )
if target_app_labels_only: if target_app_labels_only:
self.stdout.write( self.stdout.write(
self.style.MIGRATE_LABEL(" Apply all migrations: ") + self.style.MIGRATE_LABEL(" Apply all migrations: ") +
(", ".join(set(a for a, n in targets)) or "(none)") (", ".join(sorted(set(a for a, n in targets))) or "(none)")
) )
else: else:
if targets[0][1] is None: if targets[0][1] is None:

2
docs/intro/tutorial02.txt
View File

@ -328,7 +328,7 @@ Now, run :djadmin:`migrate` again to create those model tables in your database:
$ python manage.py migrate $ python manage.py migrate
Operations to perform: Operations to perform:
Apply all migrations: admin, contenttypes, polls, auth, sessions Apply all migrations: admin, auth, contenttypes, polls, sessions
Running migrations: Running migrations:
Rendering model states... DONE Rendering model states... DONE
Applying polls.0001_initial... OK Applying polls.0001_initial... OK

2
docs/ref/contrib/gis/tutorial.txt
View File

@ -283,7 +283,7 @@ database:
$ python manage.py migrate $ python manage.py migrate
Operations to perform: Operations to perform:
Apply all migrations: admin, world, contenttypes, auth, sessions Apply all migrations: admin, auth, contenttypes, sessions, world
Running migrations: Running migrations:
... ...
Applying world.0001_initial... OK Applying world.0001_initial... OK