pld-builder.new: PLD_Builder/request.py, PLD_Builder/rpm_builder.py Store m...

[arekm]

Author: arekm                        Date: Wed Mar  4 07:51:50 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Store maxjobs exactly what user requested and apply it when actually building package.

---- Files affected:
pld-builder.new/PLD_Builder:
   request.py (1.60 -> 1.61) , rpm_builder.py (1.70 -> 1.71) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/request.py
diff -u pld-builder.new/PLD_Builder/request.py:1.60 pld-builder.new/PLD_Builder/request.py:1.61
--- pld-builder.new/PLD_Builder/request.py:1.60	Wed Mar  4 00:15:31 2009
+++ pld-builder.new/PLD_Builder/request.py	Wed Mar  4 08:51:45 2009
@@ -45,7 +45,7 @@
         self.priority = 2
         self.time = time.time()
         self.requester = ""
-        self.max_jobs = max(min(os.sysconf('SC_NPROCESSORS_ONLN'), config.max_jobs), 1)
+        self.max_jobs = 0
         self.requester_email = ""
         self.flags = string.split(attr(e, "flags", ""))
         for c in e.childNodes:
@@ -62,7 +62,7 @@
             elif c.nodeName == "time":
                 self.time = int(text(c))
             elif c.nodeName == "maxjobs":
-                self.max_jobs = max(min(int(text(c)), config.max_jobs), 1)
+                self.max_jobs = int(text(c))
             else:
                 log.panic("xml: evil group child (%s)" % c.nodeName)
         # note that we also check that group is sorted WRT deps

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.70 pld-builder.new/PLD_Builder/rpm_builder.py:1.71
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.70	Tue Mar  3 23:56:09 2009
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Wed Mar  4 08:51:45 2009
@@ -124,8 +124,11 @@
             if ("no-install-br" not in r.flags) and not install.install_br(r, b):
                 res = "FAIL_DEPS_INSTALL"
             if not res:
+                max_jobs = 1
+                if r.max_jobs > 0:
+                    max_jobs = min(config.max_jobs, r.max_jobs)
                 cmd = "cd rpm/SPECS; TMPDIR=%s nice -n %s rpmbuild -bb --define '_smp_mflags -j%d' %s %s" % \
-                            (tmpdir, config.nice, r.max_jobs, rpmbuild_opt, b.spec)
+                            (tmpdir, config.nice, max_jobs, rpmbuild_opt, b.spec)
                 b.log_line("building RPM using: %s" % cmd)
                 res = chroot.run(cmd, logfile = b.logfile)
                 if res:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request.py?r1=1.60&r2=1.61&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.70&r2=1.71&f=u