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

Jelmer Vernooij jelmer at samba.org
Sat Nov 13 11:43:00 MST 2010


The branch, master has been updated
       via  c3b0245 Try a bit harder to not fetch from the upload directory when looking for old builds.
      from  7f9ad8f Fix formatting.

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


- Log -----------------------------------------------------------------
commit c3b0245cc29002085ff3c1e8cdcd6a565ebb5bb9
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 13 19:42:52 2010 +0100

    Try a bit harder to not fetch from the upload directory when looking for old builds.

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

Summary of changes:
 buildfarm/__init__.py |    2 +-
 import-and-analyse.py |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py
index 58b66fb..8d593c4 100644
--- a/buildfarm/__init__.py
+++ b/buildfarm/__init__.py
@@ -130,7 +130,7 @@ class BuildFarm(object):
         return perc
 
     def get_build(self, tree, host, compiler, rev=None):
-        if rev:
+        if rev is not None:
             return self.builds.get_build(tree, host, compiler, rev)
         else:
             return self.upload_builds.get_build(tree, host, compiler)
diff --git a/import-and-analyse.py b/import-and-analyse.py
index ec61fba..ed854ec 100755
--- a/import-and-analyse.py
+++ b/import-and-analyse.py
@@ -115,11 +115,13 @@ for build in buildfarm.get_new_builds():
         # Can't send a nastygram until there are 2 builds..
     else:
         try:
-            prev_build = buildfarm.get_build(build.tree, build.host, build.compiler, prev_rev)
+            assert prev_rev is not None
+            prev_build = buildfarm.builds.get_build(build.tree, build.host, build.compiler, prev_rev)
         except data.NoSuchBuildError:
             if opts.verbose >= 1:
                 print "Previous build %s has disappeared" % prev_build
         else:
+            assert build.log_checksum() != prev_build.log_checksum()
             check_and_send_mails(build.tree, build.host, build.compiler, build, prev_build)
 
     if not opts.dry_run:


-- 
build.samba.org


More information about the samba-cvs mailing list