]> code.ossystems Code Review - openembedded-core.git/commitdiff
utils.py: Fix parallel_make limit
authorJoshua Watt <jpewhacker@gmail.com>
Fri, 16 Feb 2018 20:30:00 +0000 (14:30 -0600)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 24 Feb 2018 10:31:35 +0000 (10:31 +0000)
parallel_make_argument() was incorrectly taking the maximum of the limit
and the calculated value instead of the minimum.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/lib/oe/utils.py

index ec91927233a6b50c37ec8b643d9fbf3f2ce585a7..80f0442d0aec9954135a38c9782596ae95239bda 100644 (file)
@@ -195,7 +195,7 @@ def parallel_make_argument(d, fmt, limit=None):
     v = parallel_make(d)
     if v:
         if limit:
-            v = max(limit, v)
+            v = min(limit, v)
         return fmt % v
     return ''