From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 13 Mar 2009 10:35:14 +0000 (+0100)
Subject: Buildspy: Receive system.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29d9e3363d7c7f745b2bc4b814cdc9ab79b71342;p=ipfire.org.git

Buildspy: Receive system.
---

diff --git a/build/builder.py b/build/builder.py
index e825fa4b..73c643ae 100644
--- 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 7ebf502b..d4b4981e 100644
--- 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 686ce37c..a613ce62 100644
--- 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())):