diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2010-05-27 13:07:52 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-05-27 13:07:52 -0700 |
| commit | 8c04a982e9568762afa7d868670756332cd837ce (patch) | |
| tree | 24af47be13307d6267943c44a697e3f2a8aaabef /classes | |
| parent | ac5931ec6710eebd9b5fa60f1c3c30f1ac4301f9 (diff) | |
| download | openembedded-8c04a982e9568762afa7d868670756332cd837ce.tar.gz | |
Revert "patch.bbclass: use param_bool()"
This reverts commit 7cb990de933f22331cd701ecb45d1e30dd8f3c11.
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/patch.bbclass | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 09ce781202..7b0c44471a 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -6,7 +6,6 @@ QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc" PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot" python patch_do_patch() { - import oe.utils import oe.patch src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split() @@ -47,13 +46,15 @@ python patch_do_patch() { local = os.path.join(workdir, base) ext = os.path.splitext(base)[1] - is_patch = ext in (".diff", ".patch") - - if not oe.utils.param_bool(parm, 'apply', is_patch): - 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 not is_patch: + elif ext not in (".diff", ".patch"): continue if not local: |