[oe-commits] Richard Purdie : bitbake.conf: Use casting to ensure valid comparision

git at git.openembedded.org git at git.openembedded.org
Thu May 9 08:42:04 UTC 2013


Module: openembedded-core.git
Branch: master-next
Commit: 099d5db2ac0602cd735c33431a7686e8cc41e865
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=099d5db2ac0602cd735c33431a7686e8cc41e865

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue May  7 13:56:06 2013 +0100

bitbake.conf: Use casting to ensure valid comparision

python3 is stricter about type comparisions so add an explicit cast to int()
to ensure this code is portable.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/conf/bitbake.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d5e923b..8d4ccce 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -188,7 +188,7 @@ PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or '1.0'}"
 PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[2] or 'r0'}"
 PRINC ?= "0"
 PF = "${PN}-${EXTENDPE}${PV}-${PR}"
-EXTENDPE = "${@['','${PE\x7d_'][d.getVar('PE',1) > 0]}"
+EXTENDPE = "${@['','${PE\x7d_'][int(d.getVar('PE',1) or 0) > 0]}"
 P = "${PN}-${PV}"
 
 EXTENDPRAUTO = "${@['.${PRAUTO\x7d',''][d.getVar('PRAUTO',1) is None]}"
@@ -196,7 +196,7 @@ PRAUTOINX = "${PF}"
 
 PKGV ?= "${PV}"
 PKGR ?= "${PR}${EXTENDPRAUTO}"
-PKGE ?= "${@['','${PE\x7d'][d.getVar('PE',1) > 0]}"
+PKGE ?= "${@['','${PE\x7d'][int(d.getVar('PE',1) or 0) > 0]}"
 EXTENDPKGEVER = "${@['','${PKGE\x7d:'][d.getVar('PKGE',1).strip() != '']}"
 EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}"
 





More information about the Openembedded-commits mailing list