diff options
| author | Christopher Larson <chris_larson@mentor.com> | 2013-08-27 16:27:40 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-28 00:34:13 +0100 |
| commit | 092190e20b42cb38dd3f497dd6375f01fd973d66 (patch) | |
| tree | aa70265f251175f09b080d5398d7f68945305069 /bitbake | |
| parent | 9b052712efbdc6308ef756276c72141ac923cfa8 (diff) | |
| download | ast2050-yocto-poky-092190e20b42cb38dd3f497dd6375f01fd973d66.zip ast2050-yocto-poky-092190e20b42cb38dd3f497dd6375f01fd973d66.tar.gz | |
bitbake: data_smart: use a split/filter/rejoin for _remove
This is more idiomatic, and from the limited performance testing I did, is
faster as well. See https://gist.github.com/kergoth/6360248 for the naive
benchmark.
(Bitbake rev: 1aa49226d5a2bac911feeb90e3d9f19529bc1a3e)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/data_smart.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 3fb88a9..6229fbf 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -589,13 +589,9 @@ class DataSmart(MutableMapping): if expand and value: value = self.expand(value, None) if value and flag == "_content" and local_var and "_removeactive" in local_var: - for i in local_var["_removeactive"]: - if " " + i + " " in value: - value = value.replace(" " + i + " ", " ") - if value.startswith(i + " "): - value = value[len(i + " "):] - if value.endswith(" " + i): - value = value[:-len(" " + i)] + filtered = filter(lambda v: v not in local_var["_removeactive"], + value.split(" ")) + value = " ".join(filtered) return value def delVarFlag(self, var, flag, **loginfo): |
