Package: rebuildd
Version: 0.3.5
Severity: normal
Please apply this patch for solve problem with http server, it has changes for
webpy 3.0
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.30-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages rebuildd depends on:
ii lsb-base 3.2-22 Linux Standard Base 3.2 init scrip
ii python 2.5.4-2 An interactive high-level object-o
ii python-apt 0.7.10.4 Python interface to libapt-pkg
ii python-sqlobject 0.10.6-1 Python module for SQLObject
ii python-support 1.0.3 automated rebuilding support for P
Versions of packages rebuildd recommends:
ii pbuilder 0.189 personal package builder for Debia
ii python-gdchart2 0.beta1-3.4 Python OO interface to GDChart
ii python-webpy 0.310-1 Web framework for Python applicati
Versions of packages rebuildd suggests:
ii cowdancer 0.56 Copy-on-write directory tree utili
-- no debconf information
>From 485c3d2138bca8d48cbb6135a6e071672db82a76 Mon Sep 17 00:00:00 2001
From: root <r...@grupoikusnet.com>
Date: Sun, 19 Jul 2009 16:16:11 +0200
Subject: [PATCH] Webpy3
---
rebuildd/RebuilddHTTPServer.py | 21 ++++++++++++---------
templates/base.html | 2 +-
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/rebuildd/RebuilddHTTPServer.py b/rebuildd/RebuilddHTTPServer.py
index eb1d30e..25bef3f 100644
--- a/rebuildd/RebuilddHTTPServer.py
+++ b/rebuildd/RebuilddHTTPServer.py
@@ -35,7 +35,7 @@ render = web.template.render(RebuilddConfig().get('http', 'templates_dir'), \
class RequestIndex:
def GET(self):
- print render.base(page=render.index(), \
+ return render.base(page=render.index(), \
hostname=socket.gethostname(), \
archs=RebuilddConfig().arch, \
dists=RebuilddConfig().get('build', 'dists').split(' '))
@@ -54,7 +54,7 @@ class RequestPackage:
title = package = name
jobs.extend(Job.selectBy(package=pkg))
- print render.base(page=render.tab(jobs=jobs), \
+ return render.base(page=render.tab(jobs=jobs), \
hostname=socket.gethostname(), \
title=title, \
package=package, \
@@ -67,7 +67,7 @@ class RequestArch:
jobs = []
jobs.extend(Job.select(sqlobject.AND(Job.q.arch == arch, Job.q.dist == dist),
orderBy=sqlobject.DESC(Job.q.creation_date))[:10])
- print render.base(page=render.tab(jobs=jobs), \
+ return render.base(page=render.tab(jobs=jobs), \
arch=arch, \
dist=dist, \
title="%s/%s" % (dist, arch), \
@@ -86,7 +86,7 @@ class RequestJob:
except IOError, error:
build_log = "No build log available"
- print render.base(page=render.job(job=job, build_log=build_log), \
+ return render.base(page=render.job(job=job, build_log=build_log), \
hostname=socket.gethostname(), \
title="job %s" % job.id, \
archs=RebuilddConfig().arch, \
@@ -141,7 +141,7 @@ class RequestGraph:
tmp = tempfile.TemporaryFile()
graph.draw(tmp)
tmp.seek(0)
- print tmp.read()
+ return tmp.read()
def GET_package(self, package=None):
graph = self.graph_init()
@@ -158,7 +158,7 @@ class RequestGraph:
tmp = tempfile.TemporaryFile()
graph.draw(tmp)
tmp.seek(0)
- print tmp.read()
+ return tmp.read()
class RebuilddHTTPServer:
"""Main HTTP server"""
@@ -180,6 +180,9 @@ class RebuilddHTTPServer:
"""Run main HTTP server thread"""
web.webapi.internalerror = web.debugerror
- web.httpserver.runsimple(web.webapi.wsgifunc(web.webpyfunc(self.urls, globals(), False)),
- (RebuilddConfig().get('http', 'ip'),
- RebuilddConfig().getint('http', 'port')))
+
+ import sys; sys.argv.append(RebuilddConfig().get('http', 'ip') + ":" + RebuilddConfig().get('http', 'port'))
+
+ app = web.application(self.urls, globals())
+ app.run()
+
diff --git a/templates/base.html b/templates/base.html
index 0fc8f2b..e60e4bd 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,4 +1,4 @@
-$def with (page, title=None, hostname="a yellow submarine", dists, archs, dist=None, arch=None, package=None)
+$def with (page=None, title=None, hostname="a yellow submarine", dists=None, archs=None, dist=None, arch=None, package=None)
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
--
1.6.3.3
