[Buildbot-commits] buildbot/buildbot/status builder.py, 1.103, 1.104

[Brian Warner]

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

Modified Files:
	builder.py 
Log Message:
[project @ fix getURLForThing, it was out-of-date, and add tests. Closes #112.]

Original author: warner at lothar.com
Date: 2007-10-10 08:32:16+00:00

Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- builder.py	30 Sep 2007 18:48:13 -0000	1.103
+++ builder.py	10 Oct 2007 08:32:59 -0000	1.104
@@ -1798,23 +1798,23 @@
             pass
         if interfaces.IBuilderStatus.providedBy(thing):
             builder = thing
-            return prefix + urllib.quote(builder.getName(), safe='')
+            return prefix + "builders/%s" % (
+                urllib.quote(builder.getName(), safe=''),
+                )
         if interfaces.IBuildStatus.providedBy(thing):
             build = thing
             builder = build.getBuilder()
-            return "%s%s/builds/%d" % (
-                prefix,
+            return prefix + "builders/%s/builds/%d" % (
                 urllib.quote(builder.getName(), safe=''),
                 build.getNumber())
         if interfaces.IBuildStepStatus.providedBy(thing):
             step = thing
             build = step.getBuild()
             builder = build.getBuilder()
-            return "%s%s/builds/%d/%s" % (
-                prefix,
+            return prefix + "builders/%s/builds/%d/steps/%s" % (
                 urllib.quote(builder.getName(), safe=''),
                 build.getNumber(),
-                "step-" + urllib.quote(step.getName(), safe=''))
+                urllib.quote(step.getName(), safe=''))
         # IBuildSetStatus
         # IBuildRequestStatus
         # ISlaveStatus
@@ -1840,11 +1840,10 @@
                     break
             else:
                 return None
-            return "%s%s/builds/%d/%s/%d" % (
-                prefix,
+            return prefix + "builders/%s/builds/%d/steps/%s/logs/%d" % (
                 urllib.quote(builder.getName(), safe=''),
                 build.getNumber(),
-                "step-" + urllib.quote(step.getName(), safe=''),
+                urllib.quote(step.getName(), safe=''),
                 lognum)
 
     def getChangeSources(self):