pld-builder.new: PLD_Builder/request.py - protect against some stupid values

arekm arekm at pld-linux.org
Wed Mar 4 00:15:37 CET 2009


Author: arekm                        Date: Tue Mar  3 23:15:37 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- protect against some stupid values

---- Files affected:
pld-builder.new/PLD_Builder:
   request.py (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/request.py
diff -u pld-builder.new/PLD_Builder/request.py:1.59 pld-builder.new/PLD_Builder/request.py:1.60
--- pld-builder.new/PLD_Builder/request.py:1.59	Tue Mar  3 23:59:13 2009
+++ pld-builder.new/PLD_Builder/request.py	Wed Mar  4 00:15:31 2009
@@ -45,7 +45,7 @@
         self.priority = 2
         self.time = time.time()
         self.requester = ""
-        self.max_jobs = min(os.sysconf('SC_NPROCESSORS_ONLN'), config.max_jobs)
+        self.max_jobs = max(min(os.sysconf('SC_NPROCESSORS_ONLN'), config.max_jobs), 1)
         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 = min(int(text(c)), config.max_jobs)
+                self.max_jobs = max(min(int(text(c)), config.max_jobs), 1)
             else:
                 log.panic("xml: evil group child (%s)" % c.nodeName)
         # note that we also check that group is sorted WRT deps
================================================================

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



More information about the pld-cvs-commit mailing list