From: Chris Larson Date: Tue, 23 Nov 2010 22:30:45 +0000 (-0700) Subject: cooker: use re match, not search in re_match_strings X-Git-Tag: 2011-1~3089 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=72c6953488149f1c1fe93a1191f5aa88e6f128de;p=openembedded-core.git cooker: use re match, not search in re_match_strings We want to match the requested pattern at the beginning of the string, otherwise things behave in an unintuitive manner wrt ASSUME_PROVIDED (e.g. ASSUME_PROVIDED += "gtk+" will also assume foo-gtk+ is provided), and the user can always use '.*gtk+' to get the old behavior. (Bitbake rev: 5670134ab2eb573d39df3c3231677cdb1a1dfc72) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py index d2a3505787..81a42b7b53 100644 --- a/bitbake/lib/bb/taskdata.py +++ b/bitbake/lib/bb/taskdata.py @@ -34,7 +34,7 @@ def re_match_strings(target, strings): Whether or not the string 'target' matches any one string of the strings which can be regular expression string """ - return any(name == target or re.search(name, target) != None + return any(name == target or re.match(name, target) for name in strings) class TaskData: