Added pxe site.

[ipfire.org.git] / build / builder.py

diff --git a/build/builder.py b/build/builder.py
index 92ef9cb2728c63a2098c32f4d6a4a2811d02c0bf..73c643aecec6136cc2f53b91bd69e5429d964e7d 100644 (file)
--- a/build/builder.py
+++ b/build/builder.py
@@ -112,6 +112,7 @@ class DatabaseConfig:
                c.close()
                self.data = value
                self.db.commit()
+               return """Set "%s" to "%s".""" % (self.key, self.data,)
 
 class DurationsConfig:
        def __init__(self, db):
@@ -138,6 +139,7 @@ class DurationsConfig:
                                                "value" : value, })
                c.close()
                self.db.commit()
+               return """Accepted build duration of %s seconds.""" % (value,)
 
        def get_avg(self):
                sum = 0
@@ -165,8 +167,8 @@ class DistccConfig(DatabaseConfig):
        def __str__(self):
                if not self.ping() or self.get() == "0":
                        return ""
-               return "%s:%s/%s,lzo   \t# %s" % \
-                       (socket.gethostbyname(self.hostname), self.get(), self.jobs or "4", self.hostname)
+               return "%s:%s/%s,lzo" % \
+                       (self.hostname, self.get(), self.jobs or "4",)
 
        def ping(self):
                if not self.hostname:
@@ -202,6 +204,7 @@ class FileConfig:
                for line in base64.b64decode(lines).split("\n"):
                        f.write("%s\n" % line.rstrip("\n"))
                f.close()
+               return """Saved file content to %s.""" % (self.filename,)
 
 class Builder:
        def __init__(self, config, uuid):
@@ -221,12 +224,14 @@ class Builder:
                self.state    = DatabaseConfig(self.db, "state")
                self.package  = DatabaseConfig(self.db, "package")
                self.target   = DatabaseConfig(self.db, "target")
+               self.toolchain= DatabaseConfig(self.db, "toolchain")
 
                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.system   = DatabaseConfig(self.db, "system", base64=1)
 
                self.log      = FileConfig(self.path, "log")
                
@@ -250,13 +255,13 @@ class Builder:
                        self.state.set("unknown")
 
                # If host was longer than four weels in distcc state we delete it.
-               if self.state() == "unknown" and \
+               if self.state() in ("distcc", "unknown",) and \
                                (time.time() - self.state.time()) > 4*7*24*60*60:
                        del self.db
                        shutil.rmtree(self.path)
 
        def set(self, key, value):
-               eval("self.%s.set(\"%s\")" % (key, value,))
+               return eval("self.%s.set(\"%s\")" % (key, value,))
 
        def get(self, key):
                return eval("self.%s.get()" % (key,))