From warner at users.sourceforge.net Tue Feb 1 08:36:14 2005 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 01 Feb 2005 08:36:14 +0000 Subject: [Buildbot-commits] buildbot/buildbot __init__.py,1.7,1.8 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27463/buildbot Modified Files: __init__.py Log Message: (version): bump to 0.6.2+ while between releases Index: __init__.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/__init__.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- __init__.py 13 Dec 2004 08:23:42 -0000 1.7 +++ __init__.py 1 Feb 2005 08:36:11 -0000 1.8 @@ -1,3 +1,3 @@ #! /usr/bin/python -version = "0.6.2" +version = "0.6.2+" From warner at users.sourceforge.net Tue Feb 1 08:36:48 2005 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 01 Feb 2005 08:36:48 +0000 Subject: [Buildbot-commits] buildbot/buildbot/status html.py,1.49,1.50 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/status In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27597/buildbot/status Modified Files: html.py Log Message: (TextLog.getChild): use a /text child URL, such as http://foo.com/svn-hello/builds/1/test/0/text instead of http://foo.com/svn-hello/builds/1/test/0 , to retrieve the logfile as text/plain (no markup, no headers). This replaces the previous scheme (which used an ?text=1 argument), and gets us back to a relative link (which works better when the buildbot lives behind another web server, such as Apache configured as a reverse proxy). Thanks to Gerald Combs for spotting the problem. Index: html.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/status/html.py,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- html.py 9 Dec 2004 10:26:13 -0000 1.49 +++ html.py 1 Feb 2005 08:36:45 -0000 1.50 @@ -495,18 +495,25 @@ # a new instance of this Resource is created for each client who views # it, so we can afford to track the request in the Resource. __implements__ = IHTMLLog, + asText = False def __init__(self, original): Resource.__init__(self) self.original = original + def getChild(self, path, request): + if path == "text": + self.asText = True + return self + return NoResource("bad pathname") + def htmlHeader(self, request): title = "Log File contents" data = "\n" + title + "\n" data += textlog_stylesheet data += "\n" data += "\n" - texturl = request.prePathURL() + "?text=1" + texturl = request.childLink("text") data += '(view as text)
\n' % texturl data += "
\n"
         return data
@@ -529,7 +536,7 @@
         return data
 
     def render_HEAD(self, request):
-        if request.args.has_key("text"):
+        if self.asText:
             request.setHeader("content-type", "text/plain")
         else:
             request.setHeader("content-type", "text/html")
@@ -563,9 +570,6 @@
 
     def render_GET(self, req):
         self.req = req
-        self.asText = False
-        if self.req.args.has_key("text"):
-            self.asText = True
 
         if self.asText:
             req.setHeader("content-type", "text/plain")




From warner at users.sourceforge.net  Tue Feb  1 08:36:48 2005
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 01 Feb 2005 08:36:48 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.339,1.340
Message-ID: 

Update of /cvsroot/buildbot/buildbot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27597

Modified Files:
	ChangeLog 
Log Message:
(TextLog.getChild): use a /text child URL, such as
http://foo.com/svn-hello/builds/1/test/0/text instead of
http://foo.com/svn-hello/builds/1/test/0 , to retrieve the logfile as
text/plain (no markup, no headers). This replaces the previous scheme (which
used an ?text=1 argument), and gets us back to a relative link (which works
better when the buildbot lives behind another web server, such as Apache
configured as a reverse proxy). Thanks to Gerald Combs for spotting the
problem.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -d -r1.339 -r1.340
--- ChangeLog	13 Dec 2004 08:23:42 -0000	1.339
+++ ChangeLog	1 Feb 2005 08:36:46 -0000	1.340
@@ -1,3 +1,17 @@
+2005-02-01  Brian Warner  
+
+	* buildbot/status/html.py (TextLog.getChild): use a /text child
+	URL, such as http://foo.com/svn-hello/builds/1/test/0/text instead
+	of http://foo.com/svn-hello/builds/1/test/0 , to retrieve the
+	logfile as text/plain (no markup, no headers). This replaces the
+	previous scheme (which used an ?text=1 argument), and gets us back
+	to a relative link (which works better when the buildbot lives
+	behind another web server, such as Apache configured as a reverse
+	proxy). Thanks to Gerald Combs for spotting the problem.
+
+	* buildbot/__init__.py (version): bump to 0.6.2+ while between
+	releases
+
 2004-12-13  Brian Warner  
 
 	* buildbot/__init__.py (version): Releasing buildbot-0.6.2