[pypy-svn] r41576 - in pypy/build/buildtool: . web/templates
guido at codespeak.net
guido at codespeak.net
Wed Mar 28 16:04:54 CEST 2007
Author: guido
Date: Wed Mar 28 16:04:52 2007
New Revision: 41576
Modified:
pypy/build/buildtool/build.py
pypy/build/buildtool/metaserver.py
pypy/build/buildtool/web/templates/builds.html
pypy/build/buildtool/web/templates/metaserverstatus.html
Log:
Small fix in normalize_revision, some docstring and printed text (HTML) changes.
Modified: pypy/build/buildtool/build.py
==============================================================================
--- pypy/build/buildtool/build.py (original)
+++ pypy/build/buildtool/build.py Wed Mar 28 16:04:52 2007
@@ -17,7 +17,7 @@
try:
return int(u.info().created_rev)
except py.error.Error:
- if not highest_if_error:
+ if rev == 'HEAD' or not highest_if_error:
raise
u = py.path.svnurl(svnurl)
return int(u.info().created_rev)
Modified: pypy/build/buildtool/metaserver.py
==============================================================================
--- pypy/build/buildtool/metaserver.py (original)
+++ pypy/build/buildtool/metaserver.py Wed Mar 28 16:04:52 2007
@@ -63,21 +63,14 @@
self._channel.send('registered build server %s' % (builder.hostname,))
def compile(self, request):
- """start a compilation
+ """ start a compilation
- requester_email is an email address of the person requesting the
- build, info is a tuple (sysinfo, compileinfo) where both infos
- are configs converted (or serialized, basically) to dict
-
- returns a tuple (ispath, data)
-
- if there's already a build available for info, this will return
- a tuple (True, path), if not, this will return (False, message),
- where message describes what is happening with the request (is
- a build made rightaway, or is there no builder available?)
-
- in any case, if the first item of the tuple returned is False,
- an email will be sent once the build is available
+ returns a dict with keys 'path' (path to the result, can be
+ empty), 'isbuilding' (a bool indicating whether the request is
+ currently being compiled), 'id' (the id of the buildrequest
+ matching the specs of the request passed in, is the same when
+ the request is not already available or in progress) and
+ 'message' (a message explaining the situation)
"""
self._requestlock.acquire()
try:
Modified: pypy/build/buildtool/web/templates/builds.html
==============================================================================
--- pypy/build/buildtool/web/templates/builds.html (original)
+++ pypy/build/buildtool/web/templates/builds.html Wed Mar 28 16:04:52 2007
@@ -29,12 +29,12 @@
<tr>
<td style="text-align: left" colspan="3">
%(showprevoffset)[c
- <a href="?offset=%(prevoffset)s&batchsize=%(batchsize)s">previous %(batchsize)s</a>
+ <a href="?offset=%(prevoffset)s&batchsize=%(batchsize)s">newer %(batchsize)s</a>
%(showprevoffset)]c
</td>
<td style="text-align: right" colspan="2">
%(shownextoffset)[c
- <a href="?offset=%(nextoffset)s&batchsize=%(batchsize)s">next %(batchsize)s</a>
+ <a href="?offset=%(nextoffset)s&batchsize=%(batchsize)s">older %(batchsize)s</a>
%(shownextoffset)]c
</td>
</tr>
Modified: pypy/build/buildtool/web/templates/metaserverstatus.html
==============================================================================
--- pypy/build/buildtool/web/templates/metaserverstatus.html (original)
+++ pypy/build/buildtool/web/templates/metaserverstatus.html Wed Mar 28 16:04:52 2007
@@ -14,8 +14,8 @@
<li>Connected build servers: %(builders)s</li>
<li>Currently running builds: %(running)s</li>
<li>Builds done: %(done)s</li>
- <li>Clients waiting for a build: %(waiting)s</li>
- <li>Builds for which no suitable server is available: %(queued)s</li>
+ <li>Clients waiting for a running build: %(waiting)s</li>
+ <li>Queued builds: %(queued)s</li>
</ul>
</div>
</body>
More information about the Pypy-commit
mailing list