From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 29 Nov 2008 17:03:54 +0000 (+0100)
Subject: Added new parameters "cpu" and "machine".
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0359f8fc8c3db4a4c1ebf549fb24278bb4d0d709;p=ipfire.org.git

Added new parameters "cpu" and "machine".
---

diff --git a/build/builder.py b/build/builder.py
index bef9b0a2..92ef9cb2 100644
--- a/build/builder.py
+++ b/build/builder.py
@@ -55,11 +55,12 @@ class Database:
 		self.db.commit()
 
 class DatabaseConfig:
-	def __init__(self, db, key):
+	def __init__(self, db, key, base64=0):
 		self.db = db
 		self.key = key
 		self.data = None
 		self.date = None
+		self.base64 = base64
 
 	def get(self):
 		if not self.data:
@@ -90,6 +91,8 @@ class DatabaseConfig:
 		return self.date or float(0)
 
 	def set(self, value):
+		if self.base64:
+			value = base64.b64decode(value)
 		#value = (value,)
 		c = self.db.cursor()
 		if not self.get():
@@ -222,6 +225,8 @@ class Builder:
 		self.duration = DurationsConfig(self.db)
 		self.jobs     = DatabaseConfig(self.db, "jobs")
 		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.log      = FileConfig(self.path, "log")
 		
diff --git a/build/index.py b/build/index.py
index 4315b9bc..1b887313 100644
--- a/build/index.py
+++ b/build/index.py
@@ -231,12 +231,13 @@ class Box:
 		if log:
 			print """<div class="log"><p>"""
 			for i in log:
-				print "%s<br />" % (i.rstrip("\n"),)
+				if i:
+					print "%s<br />" % (i.rstrip("\n"),)
 			print """</p></div>"""
 
 	def footer(self):
-		print """<div class="footer"><p>target: %s - jobs: %s</p></div>""" \
-			% (self.builder.target(), self.builder.jobs(),)
+		print """<div class="footer"><p>cpu: %s (%s) - target: %s - jobs: %s</p></div>""" \
+			% (self.builder.cpu(), self.builder.machine(), self.builder.target(), self.builder.jobs(),)
 
 class BoxCompiling(Box):
 	def __init__(self, builder):
diff --git a/build/rpc.py b/build/rpc.py
index 5e706d53..d2930ca1 100644
--- a/build/rpc.py
+++ b/build/rpc.py
@@ -66,7 +66,7 @@ if action == "set":
 	builder = Builder(config, uuid)
 	
 	key = None
-	for key in [ "distcc", "duration", "hostname", "jobs", "log", "state", "package", "target" ]:
+	for key in [ "distcc", "duration", "hostname", "jobs", "log", "state", "package", "target", "cpu", "machine" ]:
 		for value in data.getlist(key):
 			builder.set(key, value)
 elif action == "get":