Buildspy: Receive system.

diff --git a/build/builder.py b/build/builder.py
index e825fa4b52a30e110bf037ad325f1cb38e679ca6..73c643aecec6136cc2f53b91bd69e5429d964e7d 100644 (file)
--- a/build/builder.py
+++ b/build/builder.py
@@ -231,6 +231,7 @@ class Builder:
                self.distcc   = DistccConfig(self.db, "distcc", self.hostname(), self.jobs())
                self.cpu      = DatabaseConfig(self.db, "cpu", base64=1)
                self.machine  = DatabaseConfig(self.db, "machine")
+               self.system   = DatabaseConfig(self.db, "system", base64=1)
 
                self.log      = FileConfig(self.path, "log")
                

diff --git a/build/index.py b/build/index.py
index 7ebf502bd91fc1a689b65ab527a60ce4aac62f4d..d4b4981e21ee35e235f4218955209245b0b40054 100644 (file)
--- a/build/index.py
+++ b/build/index.py
@@ -236,8 +236,8 @@ class Box:
                        print """</p></div>"""
 
        def footer(self):
-               print """<div class="footer"><p>cpu: %s - target: %s - jobs: %s - toolchain: %s</p></div>""" \
-                       % (self.builder.cpu(), self.builder.target(), self.builder.jobs(), self.builder.toolchain(),)
+               print """<div class="footer"><p>system: %s - cpu: %s <br /> target: %s - jobs: %s - toolchain: %s</p></div>""" \
+                       % (self.builder.system(), self.builder.cpu(), self.builder.target(), self.builder.jobs(), self.builder.toolchain(),)
 
 class BoxCompiling(Box):
        def __init__(self, builder):

diff --git a/build/rpc.py b/build/rpc.py
index 686ce37c95ece8d9d8550569590f4afe89b4f363..a613ce623eb83629dbc04e95b194bd46592ecef5 100644 (file)
--- a/build/rpc.py
+++ b/build/rpc.py
@@ -29,7 +29,7 @@ from builder import Builder, getAllBuilders
 from constants import config
 
 ALLOWED_ACTIONS_SET = (        "distcc", "duration", "hostname", "jobs", "log", "state",
-                                               "package", "target", "toolchain", "cpu", "machine",)
+                                               "package", "target", "toolchain", "cpu", "machine", "system",)
 ALLOWED_ACTIONS_GET = ( "distcc",)
 
 def run(uuid, action):
@@ -45,7 +45,7 @@ def run(uuid, action):
                                                for builder in builders:
                                                        # Print "localhost" for ourself
                                                        if myself.uuid == builder.uuid:
-                                                               print "localhost/%s" % (builder.jobs() or "4")
+                                                               print "localhost"
                                                        else:
                                                                if ((myself.toolchain() == builder.toolchain()) and \
                                                                        (myself.target() == builder.target())):