Renamed migrations with the same prefix. Changed dependencies to set correct order.
Signed-off-by: Ed Bartosh <[email protected]> --- .../{0002_auto_20160120_1250.py => 0003_auto_20160120_1250.py} | 2 +- .../migrations/0007_merge.py => bldcontrol/migrations/0004_merge.py} | 3 +-- .../{0006_add_cancelled_state.py => 0007_add_cancelled_state.py} | 1 + .../migrations/0003_merge.py => orm/migrations/0008_merge.py} | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) rename bitbake/lib/toaster/bldcontrol/migrations/{0002_auto_20160120_1250.py => 0003_auto_20160120_1250.py} (87%) rename bitbake/lib/toaster/{orm/migrations/0007_merge.py => bldcontrol/migrations/0004_merge.py} (68%) rename bitbake/lib/toaster/orm/migrations/{0006_add_cancelled_state.py => 0007_add_cancelled_state.py} (90%) rename bitbake/lib/toaster/{bldcontrol/migrations/0003_merge.py => orm/migrations/0008_merge.py} (65%) diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py b/bitbake/lib/toaster/bldcontrol/migrations/0003_auto_20160120_1250.py similarity index 87% rename from bitbake/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py rename to bitbake/lib/toaster/bldcontrol/migrations/0003_auto_20160120_1250.py index 0c2475a..b786aeb 100644 --- a/bitbake/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py +++ b/bitbake/lib/toaster/bldcontrol/migrations/0003_auto_20160120_1250.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('bldcontrol', '0001_initial'), + ('bldcontrol', '0002_add_cancelling_state'), ] operations = [ diff --git a/bitbake/lib/toaster/orm/migrations/0007_merge.py b/bitbake/lib/toaster/bldcontrol/migrations/0004_merge.py similarity index 68% rename from bitbake/lib/toaster/orm/migrations/0007_merge.py rename to bitbake/lib/toaster/bldcontrol/migrations/0004_merge.py index 5d92f336..977650b 100644 --- a/bitbake/lib/toaster/orm/migrations/0007_merge.py +++ b/bitbake/lib/toaster/bldcontrol/migrations/0004_merge.py @@ -7,8 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('orm', '0006_add_cancelled_state'), - ('orm', '0006_remove_build_build_name'), + ('bldcontrol', '0003_auto_20160120_1250'), ] operations = [ diff --git a/bitbake/lib/toaster/orm/migrations/0006_add_cancelled_state.py b/bitbake/lib/toaster/orm/migrations/0007_add_cancelled_state.py similarity index 90% rename from bitbake/lib/toaster/orm/migrations/0006_add_cancelled_state.py rename to bitbake/lib/toaster/orm/migrations/0007_add_cancelled_state.py index f8ec65a..dab0a94 100644 --- a/bitbake/lib/toaster/orm/migrations/0006_add_cancelled_state.py +++ b/bitbake/lib/toaster/orm/migrations/0007_add_cancelled_state.py @@ -8,6 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('orm', '0004_provides'), + ('orm', '0006_remove_build_build_name'), ] operations = [ diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py b/bitbake/lib/toaster/orm/migrations/0008_merge.py similarity index 65% rename from bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py rename to bitbake/lib/toaster/orm/migrations/0008_merge.py index b0f6b16..9973bd0 100644 --- a/bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py +++ b/bitbake/lib/toaster/orm/migrations/0008_merge.py @@ -7,8 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('bldcontrol', '0002_add_cancelling_state'), - ('bldcontrol', '0002_auto_20160120_1250'), + ('orm', '0007_add_cancelled_state'), ] operations = [ -- 2.1.4 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
