pld-builder.new: PLD_Builder/rpm_builder.py - use exec to kill long running...
glen
glen at pld-linux.org
Fri Jan 22 09:51:11 CET 2010
Author: glen Date: Fri Jan 22 08:51:11 2010 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- use exec to kill long running subshell
---- Files affected:
pld-builder.new/PLD_Builder:
rpm_builder.py (1.116 -> 1.117)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.116 pld-builder.new/PLD_Builder/rpm_builder.py:1.117
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.116 Thu Jan 21 19:55:53 2010
+++ pld-builder.new/PLD_Builder/rpm_builder.py Fri Jan 22 09:51:06 2010
@@ -167,7 +167,7 @@
b.default_target(config.arch)
rpmbuild_opt = "%s %s %s" % (b.target_string(), b.kernel_string(), b.bconds_string())
# check for build arch before filling BR
- cmd = "cd rpm/SPECS; TMPDIR=%s nice -n %s rpmbuild -bp --short-circuit --nodeps --define 'prep exit 0' %s %s" % \
+ cmd = "cd rpm/SPECS; TMPDIR=%s exec nice -n %s rpmbuild -bp --short-circuit --nodeps --define 'prep exit 0' %s %s" % \
(tmpdir, config.nice, rpmbuild_opt, b.spec)
res = chroot.run(cmd, logfile = b.logfile)
if res:
@@ -183,7 +183,7 @@
max_jobs = max(min(int(os.sysconf('SC_NPROCESSORS_ONLN') * 1.5), config.max_jobs), 1)
if r.max_jobs > 0:
max_jobs = max(min(config.max_jobs, r.max_jobs), 1)
- cmd = "echo build-id: %s; cd rpm/SPECS; TMPDIR=%s nice -n %s rpmbuild -bb --define '_smp_mflags -j%d' %s %s" % \
+ cmd = "echo build-id: %s; cd rpm/SPECS; TMPDIR=%s exec nice -n %s rpmbuild -bb --define '_smp_mflags -j%d' %s %s" % \
(r.id, tmpdir, config.nice, max_jobs, rpmbuild_opt, b.spec)
b.log_line("building RPM using: %s" % cmd)
begin_time = time.time()
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.116&r2=1.117&f=u
More information about the pld-cvs-commit
mailing list