Commits

Andrew Godwin committed c3a9690

Fixed #721: Bad comparison of done migrations. Thanks to Dan Powell.

Comments (0)

Files changed (1)

south/migration/__init__.py

 
 
 def to_apply(forwards, done):
-    return [m for m in forwards if m not in done]
+    return [m for m in forwards if not is_done(m, done)]
 
 def to_unapply(backwards, done):
-    return [m for m in backwards if m in done]
+    return [m for m in backwards if is_done(m, done)]
+    
+def is_done(migration, done):
+    """
+    Returns True if migration is done, i.e. applied.
+    Otherwise returns False.
+    
+    Compares migrations by name because different instances of the 
+    same migration class do not compare as equal.
+    """
+    return migration.name() in [m.name() for m in done]
 
 def problems(pending, done):
     last = None