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

[Jelmer Vernooij]

The branch, master has been updated
       via  a6c0f05 Decode host names and platform name.
       via  938e2e7 Improve formatting in web output.
      from  bfd499b Simplify standalone code.

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


- Log -----------------------------------------------------------------
commit a6c0f05eb2109e994e614cfe290be608b07dffb0
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Nov 15 15:09:14 2010 +0100

    Decode host names and platform name.

commit 938e2e76589364ca8c92228a70ad710f977d075c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Nov 15 15:03:43 2010 +0100

    Improve formatting in web output.

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

Summary of changes:
 buildfarm/hostdb.py       |    2 +-
 buildfarm/web/__init__.py |   32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/hostdb.py b/buildfarm/hostdb.py
index 3d7029c..ed4e753 100644
--- a/buildfarm/hostdb.py
+++ b/buildfarm/hostdb.py
@@ -143,7 +143,7 @@ class PlainTextHostDatabase(HostDatabase):
         try:
             for l in f:
                 (host, platform) = l.split(":", 1)
-                ret[host] = platform.strip()
+                ret[host.decode("utf-8")] = platform.strip().decode("utf-8")
         finally:
             f.close()
         return cls(ret)
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 5f3b727..33165dc 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -922,28 +922,28 @@ class BuildFarmApp(object):
     def main_menu(self):
         """main page"""
 
-        yield "<form method='GET'>"
-        yield "<div id='build-menu'>"
-        yield "<select name='host'>"
+        yield "<form method='GET'>\n"
+        yield "<div id='build-menu'>\n"
+        yield "<select name='host'>\n"
         for name, host in self.hosts.iteritems():
             yield "<option value='%s'>%s -- %s</option>\n" % (name, host.platform.encode("utf-8"), name)
-        yield "</select>"
-        yield "<select name='tree'>"
+        yield "</select>\n"
+        yield "<select name='tree'>\n"
         for tree, t in self.buildfarm.trees.iteritems():
             yield "<option value='%s'>%s:%s</option>\n" % (tree, tree, t.branch)
-        yield "</select>"
-        yield "<select name='compiler'>"
+        yield "</select>\n"
+        yield "<select name='compiler'>\n"
         for compiler in self.buildfarm.compilers:
             yield "<option>%s</option>\n" % compiler
-        yield "</select>"
-        yield "<br/>"
-        yield "<input type='submit' name='function' value='View Build'/>"
-        yield "<input type='submit' name='function' value='View Host'/>"
-        yield "<input type='submit' name='function' value='Recent Checkins'/>"
-        yield "<input type='submit' name='function' value='Summary'/>"
-        yield "<input type='submit' name='function' value='Recent Builds'/>"
-        yield "</div>"
-        yield "</form>"
+        yield "</select>\n"
+        yield "<br/>\n"
+        yield "<input type='submit' name='function' value='View Build'/>\n"
+        yield "<input type='submit' name='function' value='View Host'/>\n"
+        yield "<input type='submit' name='function' value='Recent Checkins'/>\n"
+        yield "<input type='submit' name='function' value='Summary'/>\n"
+        yield "<input type='submit' name='function' value='Recent Builds'/>\n"
+        yield "</div>\n"
+        yield "</form>\n"
 
     def __call__(self, environ, start_response):
         form = cgi.FieldStorage(fp=environ['wsgi.input'], environ=environ)


-- 
build.samba.org