Added disabled state for distcc.

diff --git a/build/builder.py b/build/builder.py
index c72aaf04c356f1905f5e84eb7d95fcc169c2ecc4..86a07bc14a0c22e95b383931aad25310d343502b 100644 (file)
--- a/build/builder.py
+++ b/build/builder.py
@@ -157,7 +157,7 @@ class DistccConfig(DatabaseConfig):
                self.hostname = hostname
        
        def __str__(self):
-               if not self.ping():
+               if not self.ping() or self.get() == "0":
                        return ""
                return "%s:%s/4,lzo" % \
                        (socket.gethostbyname(self.hostname), self.get(),)

diff --git a/build/index.py b/build/index.py
index 9ef8c435c29bacc1c89610f11db01320adf808a1..b1ddbba591a71fed9140fe17e2917691db32e619 100644 (file)
--- a/build/index.py
+++ b/build/index.py
@@ -220,9 +220,13 @@ class Box:
        
        def distccinfo(self):
                state = self.builder.distcc.ping()
+               port = self.builder.distcc()
+               if port == "0":
+                       state = False
+                       port = "disabled"
                print """\
                                                <p class="%s">Distcc: %s</p>""" \
-                               % (ping2class[state], self.builder.distcc.get(),)
+                               % (ping2class[state], port,)
 
 site = Site(config)