From f1855fd885ce8aca10e9b0f3945f25fc57208407 Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Sun, 28 Oct 2018 19:54:10 -0400 Subject: [PATCH] Refs #23322 -- Removed unnecessary "and" clause in the autodetector. If the depedency was swappable then it'll be resolved at this point. --- django/db/migrations/autodetector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py index bf9a45530a..eacdcee98d 100644 --- a/django/db/migrations/autodetector.py +++ b/django/db/migrations/autodetector.py @@ -274,7 +274,7 @@ class MigrationAutodetector: resolved_app_label, resolved_object_name = getattr(settings, dep[1]).split('.') original_dep = dep dep = (resolved_app_label, resolved_object_name.lower(), dep[2], dep[3]) - if dep[0] != app_label and dep[0] != "__setting__": + if dep[0] != app_label: # External app dependency. See if it's not yet # satisfied. for other_operation in self.generated_operations.get(dep[0], []):