diff options
| author | Markus Holtermann <info@markusholtermann.eu> | 2016-01-28 17:52:00 +1100 |
|---|---|---|
| committer | Markus Holtermann <info@markusholtermann.eu> | 2016-01-29 10:26:04 +1100 |
| commit | 4b0118465b485e068a8d9ead2384fcc2ac741f06 (patch) | |
| tree | 514ef972012d978f0cd40347acf2d7ec5c2ed154 | |
| parent | 19d1cb14519186902d7e27813bf2643fe3f7cfa3 (diff) | |
Fixed #26150 -- Sorted app_labels in migrate command output
| -rw-r--r-- | django/core/management/commands/migrate.py | 4 | ||||
| -rw-r--r-- | docs/intro/tutorial02.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/tutorial.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/django/core/management/commands/migrate.py b/django/core/management/commands/migrate.py index 5623f8402b..b85021ac72 100644 --- a/django/core/management/commands/migrate.py +++ b/django/core/management/commands/migrate.py @@ -122,12 +122,12 @@ class Command(BaseCommand): if run_syncdb: self.stdout.write( self.style.MIGRATE_LABEL(" Synchronize unmigrated apps: ") + - (", ".join(executor.loader.unmigrated_apps)) + (", ".join(sorted(executor.loader.unmigrated_apps))) ) if target_app_labels_only: self.stdout.write( 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: if targets[0][1] is None: diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt index f6272d479c..9a92e47fad 100644 --- a/docs/intro/tutorial02.txt +++ b/docs/intro/tutorial02.txt @@ -328,7 +328,7 @@ Now, run :djadmin:`migrate` again to create those model tables in your database: $ python manage.py migrate Operations to perform: - Apply all migrations: admin, contenttypes, polls, auth, sessions + Apply all migrations: admin, auth, contenttypes, polls, sessions Running migrations: Rendering model states... DONE Applying polls.0001_initial... OK diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt index 9a09c93774..1698e94f00 100644 --- a/docs/ref/contrib/gis/tutorial.txt +++ b/docs/ref/contrib/gis/tutorial.txt @@ -283,7 +283,7 @@ database: $ python manage.py migrate Operations to perform: - Apply all migrations: admin, world, contenttypes, auth, sessions + Apply all migrations: admin, auth, contenttypes, sessions, world Running migrations: ... Applying world.0001_initial... OK |