Patchwork [14/15] bitbake.conf: Use casting to ensure valid comparision

login
register
mail settings
Submitter Richard Purdie
Date May 7, 2013, 12:56 p.m.
Message ID <1367931368-21504-14-git-send-email-richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/49457/
State Accepted
Commit b9a1b9ad55c0f9fec082ffa37e576d8fd664becd
Headers show

Comments

Richard Purdie - May 7, 2013, 12:56 p.m.
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@linuxfoundation.org>
---
 meta/conf/bitbake.conf |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

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}"