[Buildbot-commits] buildbot/buildbot/status/web baseweb.py, 1.27, 1.28

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10604/buildbot/status/web

Modified Files:
	baseweb.py 
Log Message:
[project @ Waterfall: defer to public_html/buildbot.css, to fix CSS breakage]

Original author: warner at lothar.com
Date: 2007-09-30 19:52:19+00:00

Index: baseweb.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/baseweb.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- baseweb.py	30 Sep 2007 09:24:03 -0000	1.27
+++ baseweb.py	30 Sep 2007 19:52:45 -0000	1.28
@@ -501,8 +501,12 @@
         WebStatus.__init__(self, http_port, distrib_port, allowForce)
         self.css = css
         if css:
-            data = open(css, "rb").read()
-            self.putChild("buildbot.css", static.Data(data, "text/plain"))
+            if os.path.exists(os.path.join("public_html", "buildbot.css")):
+                # they've upgraded, so defer to that copy instead
+                pass
+            else:
+                data = open(css, "rb").read()
+                self.putChild("buildbot.css", static.Data(data, "text/plain"))
         self.favicon = favicon
         self.robots_txt = robots_txt
         if favicon: