[oe-commits] [openembedded-core] 20/59: utils.py: Fix parallel_make limit

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 45205be547967c84dff96403c3a6825a62e3ca6a
Author: Joshua Watt <jpewhacker at gmail.com>
AuthorDate: Fri Feb 16 14:30:00 2018 -0600

    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 at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/lib/oe/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index ec91927..80f0442 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 ''
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.