From: Ross Burton Date: Tue, 12 Apr 2016 10:44:25 +0000 (+0100) Subject: image.bbclass: use max() instead of indexing booleans X-Git-Tag: 2016-4~65 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7ee49f8a41b4b5c48fd283ac2768564c7ebb5332;p=openembedded-core.git image.bbclass: use max() instead of indexing booleans There's some code dotted around OE that uses (a, b)[foo < bar] instead of the more idiomatic "test and a or b". Or in this case, just max(). Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ea77ab8878..039feec792 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -455,8 +455,7 @@ def get_rootfs_size(d): d.getVar('IMAGE_ROOTFS', True)]) size_kb = int(output.split()[0]) base_size = size_kb * overhead_factor - base_size = (base_size, rootfs_req_size)[base_size < rootfs_req_size] + \ - rootfs_extra_space + base_size = max(base_size, rootfs_req_size) + rootfs_extra_space if base_size != int(base_size): base_size = int(base_size + 1) @@ -544,4 +543,3 @@ do_bundle_initramfs () { : } addtask bundle_initramfs after do_image_complete -