diff options
| author |   Joshua Watt <jpewhacker@gmail.com> | 2018-02-16 14:30:00 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-24 10:31:35 +0000 |
| commit | 45205be547967c84dff96403c3a6825a62e3ca6a (patch) | |
| tree | 7adad2b63ac50209d5ee5136ab736d3a6817d862 /meta/lib | |
| parent | da7fa8a15dfafd07e5956b69996d99880596c333 (diff) | |
| download | openembedded-core-contrib-45205be547967c84dff96403c3a6825a62e3ca6a.tar.gz | |
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>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/utils.py | 2 |
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 '' |