From b9a1b9ad55c0f9fec082ffa37e576d8fd664becd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 7 May 2013 13:56:06 +0100 Subject: 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 --- meta/conf/bitbake.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d5e923b713..8d4ccce243 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}" -- cgit v1.2.3