X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=TLD_Builder%2Frpm_builder.py;h=4c4bf1f7271cf363cdc07618022f9aecd61ecb5b;hb=b7bf1e2b6deab33a0a91bbeb14f3dddf701707ba;hp=74c7faa776255abed312b0673c72a23dd23585c3;hpb=92949e17161a53bfb4a60099e22b58ad63abce4c;p=tld-builder.git diff --git a/TLD_Builder/rpm_builder.py b/TLD_Builder/rpm_builder.py index 74c7faa..4c4bf1f 100644 --- a/TLD_Builder/rpm_builder.py +++ b/TLD_Builder/rpm_builder.py @@ -283,7 +283,7 @@ def build_rpm(r, b): b.log_line("copy rpm files to cache_dir: %s" % rpm_cache_dir) chroot.run( "cp -f %s %s && poldek --mo=nodiff --mkidxz -s %s/" % \ - (string.join(b.files), rpm_cache_dir, rpm_cache_dir), + (b.files.join(), rpm_cache_dir, rpm_cache_dir), logfile = b.logfile, user = "root" ) else: @@ -338,7 +338,7 @@ def check_load(): do_exit = 0 try: f = open("/proc/loadavg") - if float(string.split(f.readline())[2]) > config.max_load: + if float(f.readline().split()[2]) > config.max_load: do_exit = 1 except: pass