Commit 90058942 authored by Claude Paroz's avatar Claude Paroz
Browse files

[1.7.x] Swapped placeholders in [sql]migrate command error 

Backport of b67e9ed8 from master.
parent 44b00af9

django/core/management/commands/migrate.py

+4 −2
Original line number Diff line number Diff line
@@ -87,9 +87,11 @@ class Command(BaseCommand): 
                try:

                    migration = executor.loader.get_migration_by_prefix(app_label, migration_name)

                except AmbiguityError:

                    raise CommandError("More than one migration matches '%s' in app '%s'. Please be more specific." % (app_label, migration_name))

                    raise CommandError("More than one migration matches '%s' in app '%s'. Please be more specific." % (

                        migration_name, app_label))

                except KeyError:

                    raise CommandError("Cannot find a migration matching '%s' from app '%s'." % (app_label, migration_name))

                    raise CommandError("Cannot find a migration matching '%s' from app '%s'." % (

                        migration_name, app_label))

                targets = [(app_label, migration.name)]

            target_app_labels_only = False

        elif len(args) == 1:

django/core/management/commands/sqlmigrate.py

+4 −2
Original line number Diff line number Diff line
@@ -39,9 +39,11 @@ class Command(BaseCommand): 
            try:

                migration = executor.loader.get_migration_by_prefix(app_label, migration_name)

            except AmbiguityError:

                raise CommandError("More than one migration matches '%s' in app '%s'. Please be more specific." % (app_label, migration_name))

                raise CommandError("More than one migration matches '%s' in app '%s'. Please be more specific." % (

                    migration_name, app_label))

            except KeyError:

                raise CommandError("Cannot find a migration matching '%s' from app '%s'. Is it in INSTALLED_APPS?" % (app_label, migration_name))

                raise CommandError("Cannot find a migration matching '%s' from app '%s'. Is it in INSTALLED_APPS?" % (

                    migration_name, app_label))

            targets = [(app_label, migration.name)]



        # Make a plan that represents just the requested migrations and show SQL