summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-11-23 15:30:45 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2011-01-04 14:46:47 +0000
commit72c6953488149f1c1fe93a1191f5aa88e6f128de (patch)
treedf2925f2a2c433b910abc0cf50043966e81508db
parent431160caf1fffaf223d50ef6239d666f69b0e4a4 (diff)
downloadpoky-72c6953488149f1c1fe93a1191f5aa88e6f128de.tar.gz
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 <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--bitbake/lib/bb/taskdata.py2
1 files changed, 1 insertions, 1 deletions
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):
34 Whether or not the string 'target' matches 34 Whether or not the string 'target' matches
35 any one string of the strings which can be regular expression string 35 any one string of the strings which can be regular expression string
36 """ 36 """
37 return any(name == target or re.search(name, target) != None 37 return any(name == target or re.match(name, target)
38 for name in strings) 38 for name in strings)
39 39
40class TaskData: 40class TaskData: