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

[Jelmer Vernooij]

The branch, master has been updated
       via  e746d6d Add script for adding status where it is not present.
      from  b22f48d Add build age to table.

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


- Log -----------------------------------------------------------------
commit e746d6db6784ac0abbd2eeee2342289984bf676f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 21 18:31:06 2010 +0100

    Add script for adding status where it is not present.

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

Summary of changes:
 buildfarm/sqldb.py        |    5 +++--
 buildfarm/web/__init__.py |    7 +------
 tools/fix-status.py       |   23 +++++++++++++++++++++++
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 tools/fix-status.py


Changeset truncated at 500 lines:

diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py
index ce75c2f..add3500 100644
--- a/buildfarm/sqldb.py
+++ b/buildfarm/sqldb.py
@@ -217,10 +217,11 @@ class StormCachingBuildResultStore(BuildResultStore):
         return new_build
 
     def get_old_revs(self, tree, host, compiler):
-        return self.store.find(StormBuild,
+        result = self.store.find(StormBuild,
             StormBuild.tree == tree,
             StormBuild.host == host,
-            StormBuild.compiler == compiler).order_by(Desc(StormBuild.upload_time))
+            StormBuild.compiler == compiler)
+        return result.order_by(Desc(StormBuild.upload_time))
 
     def get_build(self, tree, host, compiler, revision=None, checksum=None):
         expr = [
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 3ed515f..8599e88 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -465,11 +465,6 @@ class ViewBuildPage(BuildFarmPage):
                 tree, host, compiler, rev, checksum)
             return
         try:
-            (revision, revision_time) = build.revision_details()
-        except data.MissingRevisionInfo:
-            revision = None
-
-        try:
             f = build.read_log()
             try:
                 log = f.read()
@@ -511,7 +506,7 @@ class ViewBuildPage(BuildFarmPage):
         if uname is not None:
             yield "<tr><td>Uname:</td><td>%s</td></tr>\n" % uname
         yield "<tr><td>Tree:</td><td>%s</td></tr>\n" % self.tree_link(myself, tree)
-        yield "<tr><td>Build Revision:</td><td>%s</td></tr>\n" % revision_link(myself, revision, tree)
+        yield "<tr><td>Build Revision:</td><td>%s</td></tr>\n" % revision_link(myself, build.revision, tree)
         yield "<tr><td>Build age:</td><td><div class='age'>%s</div></td></tr>\n" % self.red_age(build.age)
         yield "<tr><td>Status:</td><td>%s</td></tr>\n" % build_status_html(myself, build)
         yield "<tr><td>Compiler:</td><td>%s</td></tr>\n" % compiler
diff --git a/tools/fix-status.py b/tools/fix-status.py
new file mode 100644
index 0000000..e0abfee
--- /dev/null
+++ b/tools/fix-status.py
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+
+from buildfarm.data import build_status_from_logs, LogFileMissing
+
+from buildfarm.sqldb import StormCachingBuildFarm, StormBuild
+
+x = StormCachingBuildFarm()
+
+store = x._get_store()
+for build in store.find(StormBuild, StormBuild.status_str == None):
+    try:
+        log = build.read_log()
+    except LogFileMissing:
+        continue
+    try:
+        err = build.read_err()
+        try:
+            status = build_status_from_logs(log, err)
+        finally:
+            err.close()
+    finally:
+        log.close()
+    build.status_str = status.__serialize__()


-- 
build.samba.org