Advertisement
Guest User

Untitled

a guest
Nov 27th, 2013
62
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.36 KB | None | 0 0
  1. diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
  2. index 9a6f767..439c4f2 100644
  3. --- a/bitbake/lib/bb/data_smart.py
  4. +++ b/bitbake/lib/bb/data_smart.py
  5. @@ -600,6 +600,10 @@ class DataSmart(MutableMapping):
  6.                  value = copy.copy(local_var[flag])
  7.              elif flag == "_content" and "defaultval" in local_var and not noweakdefault:
  8.                  value = copy.copy(local_var["defaultval"])
  9. +        if value is not None and flag == "_content" and local_var is not None and "_removeactive" in local_var:
  10. +            filtered = filter(lambda v: v not in local_var["_removeactive"],
  11. +                              value.split(" "))
  12. +            value = " ".join(filtered)
  13.          if expand and value:
  14.              # Only getvar (flag == _content) hits the expand cache
  15.              cachename = None
  16. @@ -608,10 +612,6 @@ class DataSmart(MutableMapping):
  17.              else:
  18.                  cachename = var + "[" + flag + "]"
  19.              value = self.expand(value, cachename)
  20. -        if value is not None and flag == "_content" and local_var is not None and "_removeactive" in local_var:
  21. -            filtered = filter(lambda v: v not in local_var["_removeactive"],
  22. -                              value.split(" "))
  23. -            value = " ".join(filtered)
  24.          return value
  25.  
  26.      def delVarFlag(self, var, flag, **loginfo):
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement