[SCM] build.samba.org - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  45c555c Don't rely on stages having the same names.
      from  6bb8d56 Add assert message.

http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 45c555c4dd5813c01835b31cabfadfbfb2f1919e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 14 08:57:07 2010 +0100

    Don't rely on stages having the same names.

-----------------------------------------------------------------------

Summary of changes:
 buildfarm/build.py |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/build.py b/buildfarm/build.py
index 28ff6d9..7689364 100644
--- a/buildfarm/build.py
+++ b/buildfarm/build.py
@@ -130,9 +130,13 @@ class BuildStatus(object):
         if len(self.stages) < len(older.stages):
             # Less stages completed
             return True
-        for ((old_name, old_result), (new_name, new_result)) in zip(
-            older.stages, self.stages):
-            assert old_name == new_name, "build stage name mismatch: %s != %s" % (old_name, new_name)
+        old_stages = dict(older.stages)
+        new_stages = dict(self.stages)
+        for name, new_result in new_stages.iteritems():
+            try:
+                old_result = old_stages[name]
+            except KeyError:
+                continue
             if new_result == old_result:
                 continue
             if new_result < 0 and old_result >= 0:


-- 
build.samba.org