Changeset 18

Timestamp:

Jun 10, 2009 3:24:20 PM (16 years ago)

Author:

retracile

Message:

Mergebot: A merge operation targeting our version blocks us

File:

• mergebot/trunk/mergebot/mergebotdaemon.py (modified) (1 diff)

mergebot/trunk/mergebot/mergebotdaemon.py

@@ -71 +71 @@
                     if task.action == 'merge' and task.version == self.version:
                         is_blocked = True
+                # A merge operation targeting our version blocks us
+                if task.action == 'merge' and task.version == self.version:
+                    is_blocked = True
                 # If there is another queued operation for this same ticket,
                 # that task blocks this one
                 if self.ticket == task.ticket:
                     is_blocked = True
+
                 if is_blocked:
                     self.blocked_by.append(task)