extras-buildsys/www builders.psp, 1.6, 1.7 failed.psp, 1.4, 1.5 index.psp, 1.7, 1.8 indiv.psp, 1.7, 1.8 job.psp, 1.9, 1.10 success.psp, 1.5, 1.6
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Thu Aug 11 19:32:40 UTC 2005
- Previous message: extras-buildsys/builder builder.py,1.30,1.31
- Next message: rpms/rpmlint/devel rpmlint-perl-bs.patch, NONE, 1.1 rpmlint-prereq.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 rpmlint-fedora-config, 1.7, 1.8 rpmlint-initvars.patch, 1.1, 1.2 rpmlint.spec, 1.15, 1.16 sources, 1.8, 1.9 rpmlint-confmsg.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcbw
Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10667/www
Modified Files:
builders.psp failed.psp index.psp indiv.psp job.psp
success.psp
Log Message:
2005-08-11 Dan Williams <dcbw at redhat.com>
* plague.spec
- Clean up to Fedora Extras standards in preparation for package submission
* builder/builder.py
- Don't ignore mock output during the 'cleanup' stage
- Make the process() function less byzantine by moving each step to a
separate function and using getattr() to call them, like in
PackageJob.py on the server
* www/*
- Clean up error handling so it actually works all the time intead of
returning Error 500 Internal Server Error when, for example, the
build server isn't running
Patch from Ville Skyttä <ville.skytta at iki.fi>
* www/template/head.psp
www/indiv.psp
- Use HTTP GET instead of POST to stop nags about form data resubmission
Index: builders.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- builders.psp 8 Aug 2005 02:54:16 -0000 1.6
+++ builders.psp 11 Aug 2005 19:32:38 -0000 1.7
@@ -19,16 +19,17 @@
(e, msg, builders) = server.list_builders()
except socket.error, e:
msg = str(e)
-%>
- <p><h2>Could not contact the server.</h2><br>Error was:<%=msg%></p>
-<%
+ e = -1
except xmlrpclib.Fault, fault:
msg = "XMLRPC Fault"
e = -1
+except Exception, e:
+ msg = str(e)
+ e = -1
if e == -1:
%>
- <p><h2>The server could not process the request.</h2><br>Error was: <%=msg%></p>
+ <p><h2>The server could not process the request.</h2><br>Error was: <%=msg%></p>
<%
else:
for builder in builders:
Index: failed.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/failed.psp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- failed.psp 6 Aug 2005 16:25:05 -0000 1.4
+++ failed.psp 11 Aug 2005 19:32:38 -0000 1.5
@@ -18,16 +18,17 @@
(e, msg, these_jobs) = server.list_jobs(args)
except socket.error, e:
msg = str(e)
-%>
- <p><h2>Could not contact the server.</h2><br>Error was:<%=msg%></p>
-<%
+ e = -1
except xmlrpclib.Fault, fault:
msg = "XMLRPC Fault"
e = -1
+except Exception, e:
+ msg = str(e)
+ e = -1
if e == -1:
%>
- <p><h2>The server could not process the request.</h2><br>Error was: <%=msg%></p>
+ <p><h2>The server could not process the request.</h2><br>Error was: <%=msg%></p>
<%
else:
i = 1
Index: index.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- index.psp 6 Aug 2005 16:25:05 -0000 1.7
+++ index.psp 11 Aug 2005 19:32:38 -0000 1.8
@@ -15,16 +15,17 @@
(e, msg, jobs) = server.list_jobs(args)
except socket.error, e:
msg = str(e)
-%>
- <p><h2>Could not contact the server.</h2><br>Error was:<%=msg%></p>
-<%
+ e = -1
except xmlrpclib.Fault, fault:
msg = "XMLRPC Fault"
e = -1
+except Exception, e:
+ msg = str(e)
+ e = -1
if e == -1:
%>
- <p><h2>The server could not process the request.</h2><br>Error was: <%=msg%></p>
+ <p><h2>The server could not process the request.</h2><br>Error was: <%=msg%></p>
<%
else:
i = 1
Index: indiv.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- indiv.psp 6 Aug 2005 16:25:05 -0000 1.7
+++ indiv.psp 11 Aug 2005 19:32:38 -0000 1.8
@@ -9,7 +9,7 @@
if not len(user_email):
%>
<center>
-<form method="POST" action="indiv.psp">
+<form method="get" action="indiv.psp">
Email Address: <input type="text" name="email">
<input type="submit" value="Show...">
</form>
@@ -40,16 +40,17 @@
targets.insert(0, 'ALL')
except socket.error, e:
msg = str(e)
-%>
- <p><h2>Could not contact the server.</h2><br>Error was:<%=msg%></p>
-<%
+ e = -1
except xmlrpclib.Fault, fault:
msg = "XMLRPC Fault"
e = -1
+ except Exception, e:
+ msg = str(e)
+ e = -1
if e == -1:
%>
- <p><h2>The server could not process the request.</h2><br>Error was: <%=msg%></p>
+ <p><h2>The server could not process the request.</h2><br>Error was: <%=msg%></p>
<%
else:
%>
@@ -65,7 +66,8 @@
<table class="filter" cellspacing="0" cellpadding="0">
<tr><td align="right">
<table class="filter-form" cellspacing="0" cellpadding="0">
- <form method="POST" action="indiv.psp?email=<%=str(user_email)%>">
+ <form method="get" action="indiv.psp">
+ <input type="hidden" name="email" value="<%=str(user_email)%>">
<tr>
<td class="filter-form-head">Filter by:</td>
<td class="filter-form-label">Status:</td>
Index: job.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- job.psp 8 Aug 2005 02:54:16 -0000 1.9
+++ job.psp 11 Aug 2005 19:32:38 -0000 1.10
@@ -23,16 +23,17 @@
(e, msg, job) = server.detail_job(uid)
except socket.error, e:
msg = str(e)
-%>
- <p><h2>Could not contact the server.</h2><br>Error was:<%=msg%></p>
-<%
+ e = -1
except xmlrpclib.Fault, fault:
msg = "XMLRPC Fault"
e = -1
+ except Exception, e:
+ msg = str(e)
+ e = -1
if e == -1:
%>
- <p><h2>The server could not process the request.</h2><br>Error was: <%=msg%></p>
+ <p><h2>The server could not process the request.</h2><br>Error was: <%=msg%></p>
<%
else:
if job.has_key('version') and job.has_key('release'):
Index: success.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/success.psp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- success.psp 8 Aug 2005 03:12:30 -0000 1.5
+++ success.psp 11 Aug 2005 19:32:38 -0000 1.6
@@ -16,16 +16,17 @@
(e, msg, jobs) = server.list_jobs(args)
except socket.error, e:
msg = str(e)
-%>
- <p><h2>Could not contact the server.</h2><br>Error was:<%=msg%></p>
-<%
+ e = -1
except xmlrpclib.Fault, fault:
msg = "XMLRPC Fault"
e = -1
+except Exception, e:
+ msg = str(e)
+ e = -1
if e == -1:
%>
- <p><h2>The server could not process the request.</h2><br>Error was: <%=msg%></p>
+ <p><h2>The server could not process the request.</h2><br>Error was: <%=msg%></p>
<%
else:
i = 1
- Previous message: extras-buildsys/builder builder.py,1.30,1.31
- Next message: rpms/rpmlint/devel rpmlint-perl-bs.patch, NONE, 1.1 rpmlint-prereq.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 rpmlint-fedora-config, 1.7, 1.8 rpmlint-initvars.patch, 1.1, 1.2 rpmlint.spec, 1.15, 1.16 sources, 1.8, 1.9 rpmlint-confmsg.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list