From bf69375c4d2eaec4f00c646b9e7e84a9397d1a20 Mon Sep 17 00:00:00 2001 From: Loic Bistuer Date: Tue, 25 Mar 2014 22:02:51 +0800 Subject: [1.7.x] Fixed #22331 -- Fixed migrations ProjectState to ignore unmanaged models. Backport of 69d4b1c3ea from master --- django/db/migrations/state.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'django') diff --git a/django/db/migrations/state.py b/django/db/migrations/state.py index ab2bd8e6d8..01019ff980 100644 --- a/django/db/migrations/state.py +++ b/django/db/migrations/state.py @@ -58,8 +58,9 @@ class ProjectState(object): "Takes in an Apps and returns a ProjectState matching it" app_models = {} for model in apps.get_models(): - model_state = ModelState.from_model(model) - app_models[(model_state.app_label, model_state.name.lower())] = model_state + if model._meta.managed: + model_state = ModelState.from_model(model) + app_models[(model_state.app_label, model_state.name.lower())] = model_state return cls(app_models) def __eq__(self, other): -- cgit v1.3