innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refs #23322 -- Removed unnecessary "and" clause in the autodetector. 

If the depedency was swappable then it'll be resolved at this point.
This commit is contained in:
Simon Charette 2018-10-28 19:54:10 -04:00 committed by Tim Graham
parent 95bda03f2d
commit f1855fd885
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/migrations/autodetector.py
View File

@ -274,7 +274,7 @@ class MigrationAutodetector:
resolved_app_label, resolved_object_name = getattr(settings, dep[1]).split('.') resolved_app_label, resolved_object_name = getattr(settings, dep[1]).split('.')
original_dep = dep original_dep = dep
dep = (resolved_app_label, resolved_object_name.lower(), dep[2], dep[3]) 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 # External app dependency. See if it's not yet
# satisfied. # satisfied.
for other_operation in self.generated_operations.get(dep[0], []): for other_operation in self.generated_operations.get(dep[0], []):