Prefix the filter and filter_out functions so as to not stomp on the filter() already...

BKrev: 4148f7beLVbTi2sIk7g3hBbhMv1aTg

diff --git a/classes/base.oeclass b/classes/base.oeclass
index 4896510..508dbd5 100644 (file)
--- a/classes/base.oeclass
+++ b/classes/base.oeclass
@@ -39,7 +39,7 @@ def base_set_filespath(path, d):
 
 FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
 
-def filter(f, str, d):
+def oe_filter(f, str, d):
        from re import match
        ret = []
        for w in str.split():
@@ -47,7 +47,7 @@ def filter(f, str, d):
                        ret += [ w ]
        return " ".join(ret)
 
-def filter_out(f, str, d):
+def oe_filter_out(f, str, d):
        from re import match
        ret = []
        for w in str.split():