[OE-core] [PATCH] image.bbclass: use max() instead of indexing booleans
Ross Burton
ross.burton at intel.com
Tue Apr 12 10:44:25 UTC 2016
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 <ross.burton at intel.com>
---
meta/classes/image.bbclass | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index ea77ab8..039feec 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
-
--
2.8.0.rc3
More information about the Openembedded-core
mailing list