[Scummvm-cvs-logs] SF.net SVN: scummvm:[48941] buildbot/config/master.cfg

[dhewg at users.sourceforge.net]

Revision: 48941
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48941&view=rev
Author:   dhewg
Date:     2010-05-04 19:04:41 +0000 (Tue, 04 May 2010)

Log Message:
-----------
Fixed local test environment without htpasswd.

Modified Paths:
--------------
    buildbot/config/master.cfg

Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg	2010-05-04 19:00:14 UTC (rev 48940)
+++ buildbot/config/master.cfg	2010-05-04 19:04:41 UTC (rev 48941)
@@ -13,6 +13,11 @@
 import scummsecret
 
 # Toggles a few things, only meant for debugging and local testing.
+
+# fake commits via the shell command:
+# trunk: buildbot sendchange --master localhost:9989 --revision_number 48939 --username testuser base/nonexistant.cpp
+# branch: buildbot sendchange --master localhost:9989 --branch branches/branch-1-1-0 --revision_number 48939 --username testuser base/nonexistant.cpp
+
 scumm_testenv = False
 
 scumm_svnroot = "https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/"
@@ -696,18 +701,28 @@
 
 from buildbot.status.html import WebStatus
 from buildbot.status.web.auth import HTPasswdAuth
+
 htfile = '/var/lib/buildbot/master/scumm_htpasswd'
+web_auth = None
+web_force = False
 
+if scumm_testenv:
+	web_force = True
+
+if os.path.exists(htfile):
+	web_auth = HTPasswdAuth(htfile)
+	web_force = True
+
 c["status"].append(
 		WebStatus(http_port = "tcp:8010:interface=127.0.0.1",
-			allowForce = True,
-			auth = HTPasswdAuth('/var/lib/buildbot/master/scumm_htpasswd')
+			allowForce = web_force,
+			auth = web_auth
 		)
 	)
 
 if scumm_testenv:
 	irc = scumm.IRC("irc.freenode.org", "svmbb",
-					channel = "#bbtest",
+					channel = "#scummbbtest",
 					categories = [ "trunk", "branch" ],
 					stableTimer = 5 * 60)
 else:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.