X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Frpm_builder.py;h=dc06fff57f7d70e876ae046025e977ca8f8698aa;hb=HEAD;hp=b266947e1f9b68031eb0fe8d66c3b462eeb4bd71;hpb=86579a75a741c01cbbc8d78fdaf8932a2cf179b3;p=tld-builder.git diff --git a/TLD_Builder/rpm_builder.py b/TLD_Builder/rpm_builder.py index b266947..a7a10b7 100644 --- a/TLD_Builder/rpm_builder.py +++ b/TLD_Builder/rpm_builder.py @@ -8,7 +8,9 @@ import atexit import time import datetime import string -import urllib +import urllib.request +import urllib.parse +import urllib.error from config import config, init_conf from bqueue import B_Queue @@ -134,7 +136,7 @@ def fetch_src(r, b): b.log_line("error: unable to write to `%s': %s" % (b.src_rpm, e)) raise - bytes = f.headers['content-length'] + bytes = float(f.headers['content-length']) f.close() o.close() t = time.time() - start @@ -153,7 +155,7 @@ def prepare_env(logfile = None): test ! -c /dev/zero && rm -f /dev/zero && mknod -m 666 /dev/zero c 1 5 # need entry for "/" in mtab, for diskspace() to work in rpm - [ -z $(awk '$2 == "/" {print $1; exit}' /etc/mtab) ] && mount -f -t rootfs rootfs / + [ -z $(awk '$2 == "/" {print $1; exit}' /etc/mtab) ] && echo "Missing rootfs entry in /etc/mtab" # make neccessary files readable for builder user # TODO: see if they really aren't readable for builder @@ -184,9 +186,6 @@ def build_rpm(r, b): b.log_line("started at: %s" % time.asctime()) - b.log_line("killing old processes on a builder") - chroot.run("/bin/kill --verbose -9 -1", logfile = b.logfile) - b.log_line("cleaning up /tmp") chroot.run("rm -rf /tmp/B.*", logfile = b.logfile) @@ -237,7 +236,7 @@ def build_rpm(r, b): if r.max_jobs > 0: max_jobs = max(min(config.max_jobs, r.max_jobs), 1) cmd = "set -ex; : build-id: %(r_id)s; TMPDIR=%(tmpdir)s exec nice -n %(nice)s " \ - "rpmbuild -bb --define '_smp_mflags -j%(max_jobs)d' --define '_make_opts -Otarget' --define '_tld_builder 1' %(rpmdefs)s %(topdir)s/%(spec)s" % { + "rpmbuild -bb --define '__jobs %(max_jobs)d' --define '_smp_mflags -j%(max_jobs)d' --define '_make_opts -Otarget' --define '_tld_builder 1' --define '_pld_builder 1' %(rpmdefs)s %(topdir)s/%(spec)s" % { 'r_id' : r.id, 'tmpdir': tmpdir, 'nice' : config.nice,