aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2018-02-16 14:30:00 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-24 10:31:35 +0000
commit45205be547967c84dff96403c3a6825a62e3ca6a (patch)
tree7adad2b63ac50209d5ee5136ab736d3a6817d862
parentda7fa8a15dfafd07e5956b69996d99880596c333 (diff)
downloadopenembedded-core-contrib-45205be547967c84dff96403c3a6825a62e3ca6a.tar.gz
openembedded-core-contrib-45205be547967c84dff96403c3a6825a62e3ca6a.tar.bz2
openembedded-core-contrib-45205be547967c84dff96403c3a6825a62e3ca6a.zip
utils.py: Fix parallel_make limit
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>
-rw-r--r--meta/lib/oe/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index ec91927233a..80f0442d0ae 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -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 ''