summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2014-06-22 13:03:25 -0700
committerAndrew Godwin <andrew@aeracode.org>2014-06-22 13:03:44 -0700
commit72d1c4a6ddb0742954e47f771e5de6f88c55a483 (patch)
tree2a657b47280849dd47b8b1c37946f1ad9f55f4f0
parentf577b2db3cec683ad0c3720eae7419c8d19c72c2 (diff)
[1.7.x] Clean up syncdb parts of migrate output if no synced apps
-rw-r--r--django/core/management/commands/migrate.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/core/management/commands/migrate.py b/django/core/management/commands/migrate.py
index 9cdd804081..2c3604806b 100644
--- a/django/core/management/commands/migrate.py
+++ b/django/core/management/commands/migrate.py
@@ -108,8 +108,8 @@ class Command(BaseCommand):
# Print some useful info
if self.verbosity >= 1:
self.stdout.write(self.style.MIGRATE_HEADING("Operations to perform:"))
- if run_syncdb:
- self.stdout.write(self.style.MIGRATE_LABEL(" Synchronize unmigrated apps: ") + (", ".join(executor.loader.unmigrated_apps) or "(none)"))
+ if run_syncdb and executor.loader.unmigrated_apps:
+ self.stdout.write(self.style.MIGRATE_LABEL(" Synchronize unmigrated apps: ") + (", ".join(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)"))
else:
@@ -122,7 +122,7 @@ class Command(BaseCommand):
# If you ever manage to get rid of this, I owe you many, many drinks.
# Note that pre_migrate is called from inside here, as it needs
# the list of models about to be installed.
- if run_syncdb:
+ if run_syncdb and executor.loader.unmigrated_apps:
if self.verbosity >= 1:
self.stdout.write(self.style.MIGRATE_HEADING("Synchronizing apps without migrations:"))
created_models = self.sync_apps(connection, executor.loader.unmigrated_apps)