summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorCarlton Gibson <carlton.gibson@noumenal.es>2018-03-09 08:57:47 +0100
committerCarlton Gibson <carlton.gibson@noumenal.es>2018-03-09 08:59:57 +0100
commit5b083a824ea90fb1705bd0c208245ff92a5237d8 (patch)
tree4c0be8717afa838f7dfe521e5612f1fcc78984bb /django
parent4d420a53cf9796ce635d16f6832b6c5f1bb7dc8a (diff)
Fixed #29180 -- Fixed a regression where migrations already in the plan were readded.
Regression in a38ae914d89809aed6d79337b74a8b31b6d3849a.
Diffstat (limited to 'django')
-rw-r--r--django/db/migrations/graph.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/migrations/graph.py b/django/db/migrations/graph.py
index c1116fd444..1f0bafb00e 100644
--- a/django/db/migrations/graph.py
+++ b/django/db/migrations/graph.py
@@ -356,7 +356,7 @@ class MigrationGraph:
plan = []
for node in nodes:
for migration in self.forwards_plan(node):
- if migration in plan or at_end or migration not in nodes:
+ if migration not in plan and (at_end or migration not in nodes):
plan.append(migration)
return plan