extras-buildsys/server PackageJob.py,1.21.2.2,1.21.2.3
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Wed Aug 31 01:23:48 UTC 2005
Author: dcbw
Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22497/server
Modified Files:
Tag: STABLE_0_3
PackageJob.py
Log Message:
2005-08-26 Dan Williams <dcbw at redhat.com>
* builder/builder.py
common/ExecUtils.py
- Thread jobs on the builder, even though we can only
do one at a time right now. It lets the job proceed
independently of the XMLRPCBuilderServer.
- Make the BuilderMock object's log function private
- Make the XMLRPCBuilderServer's log function private
- To execute mock, we now fork() and execv() the mock process
so that we can more reliably gather its output
- Correctly clean up the mock root directory
- Rename builder.log -> job.log so it can't get confused
with build.log from mock
Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -r1.21.2.2 -r1.21.2.3
--- PackageJob.py 23 Aug 2005 20:16:57 -0000 1.21.2.2
+++ PackageJob.py 31 Aug 2005 01:23:46 -0000 1.21.2.3
@@ -644,15 +644,15 @@
final_log = None
build_log = "%s/%s" % (log_dir, "build.log")
root_log = "%s/%s" % (log_dir, "root.log")
- builder_log = "%s/%s" % (log_dir, "builder.log")
+ job_log = "%s/%s" % (log_dir, "job.log")
# Try the most relevant log file first
if os.path.exists(build_log) and os.path.getsize(build_log) > 0:
final_log = build_log
elif os.path.exists(root_log) and os.path.getsize(root_log) > 0:
final_log = root_log
- elif os.path.exists(builder_log) and os.path.getsize(builder_log) > 0:
- final_log = builder_log
+ elif os.path.exists(job_log) and os.path.getsize(job_log) > 0:
+ final_log = job_log
if not final_log:
return ""
More information about the fedora-extras-commits
mailing list