Patchwork Fixes wrong comparison

login
register
mail settings
Submitter Imran Mehmood
Date Feb. 15, 2011, 4:02 p.m.
Message ID <1297785729-7009-1-git-send-email-imran_mehmood@mentor.com>
Download mbox | patch
Permalink /patch/603/
State Accepted
Headers show

Comments

Imran Mehmood - Feb. 15, 2011, 4:02 p.m.
The expression ('' or 'custom') will always result in 'custom' so the expression will become False when the variable (TARGET_OS, SDK_OS) is '' while its expected to be True in this case also.

Signed-off-by: Imran Mehmood <imran_mehmood@mentor.com>
Acked-by: Christopher Larson <chris_larson@mentor.com>
---
 conf/bitbake.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 1baecc1..de740bb 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -111,7 +111,7 @@  HOST_EXEEXT = ""
 TARGET_ARCH ?= "INVALID"
 TARGET_OS = "INVALID"
 TARGET_VENDOR = "${BUILD_VENDOR}"
-TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"
+TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) in ('', 'custom')]}"
 TARGET_PREFIX = "${TARGET_SYS}-"
 TARGET_CC_ARCH = ""
 TARGET_EXEEXT = ""
@@ -119,7 +119,7 @@  TARGET_EXEEXT = ""
 SDK_ARCH ?= "${BUILD_ARCH}"
 SDK_OS ?= "${BUILD_OS}"
 SDK_VENDOR ?= "${BUILD_VENDOR}"
-SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) == ('' or 'custom')]}"
+SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) in ('', 'custom')]}"
 SDK_PREFIX = "${SDK_SYS}-"
 SDK_CC_ARCH ?= "${BUILD_CC_ARCH}"
 SDK_EXEEXT = ""