From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 4 Oct 2008 18:11:03 +0000 (+0200)
Subject: Added disabled state for distcc.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fda98c60dcc0f0e1d774a617e885a913608c4e17;p=ipfire.org.git

Added disabled state for distcc.
---

diff --git a/build/builder.py b/build/builder.py
index c72aaf04..86a07bc1 100644
--- 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 9ef8c435..b1ddbba5 100644
--- 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)