diff options
| author | Simon Charette <charette.s@gmail.com> | 2018-10-28 19:54:10 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-10-29 11:07:07 -0400 |
| commit | f1855fd885ce8aca10e9b0f3945f25fc57208407 (patch) | |
| tree | 88add3d680ced60e03202cc516361f2eb7739dcc | |
| parent | 95bda03f2da15172cf342f13ba8a77c007b63fbb (diff) | |
Refs #23322 -- Removed unnecessary "and" clause in the autodetector.
If the depedency was swappable then it'll be resolved at this point.
| -rw-r--r-- | django/db/migrations/autodetector.py | 2 |
1 files changed, 1 insertions, 1 deletions
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], []): |