aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-05-26 12:27:56 -0700
committerChris Larson <chris_larson@mentor.com>2010-05-26 12:28:41 -0700
commita56048dedf697b749877bc258a5f751c96a71561 (patch)
tree0bf78c06d528961f1ab29e811d361e9e1933d4f1
parent8cffbaec07c0ae0a29ec8d5606c604d75f135ce8 (diff)
downloadopenembedded-a56048dedf697b749877bc258a5f751c96a71561.tar.gz
openembedded-a56048dedf697b749877bc258a5f751c96a71561.tar.bz2
openembedded-a56048dedf697b749877bc258a5f751c96a71561.zip
patch.bbclass: fix the logic error that resulted in tcp-wrappers patch application failures
Signed-off-by: Chris Larson <chris_larson@mentor.com>
-rw-r--r--classes/patch.bbclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/classes/patch.bbclass b/classes/patch.bbclass
index 73395e3c45..7b0c44471a 100644
--- a/classes/patch.bbclass
+++ b/classes/patch.bbclass
@@ -46,11 +46,12 @@ python patch_do_patch() {
local = os.path.join(workdir, base)
ext = os.path.splitext(base)[1]
- apply = parm.get("apply")
- if apply is not None and apply != "yes" and not "patch" in parm:
- if apply != "no":
- bb.msg.warn(None, "Unsupported value '%s' for 'apply' url param in '%s', please use 'yes' or 'no'" % (apply, url))
- continue
+ if "apply" in parm:
+ apply = parm["apply"]
+ if apply != "yes":
+ if apply != "no":
+ bb.msg.warn(None, "Unsupported value '%s' for 'apply' url param in '%s', please use 'yes' or 'no'" % (apply, url))
+ continue
elif "patch" in parm:
bb.msg.warn(None, "Deprecated usage of 'patch' url param in '%s', please use 'apply={yes,no}'" % url)
elif ext not in (".diff", ".patch"):