From 699ad056d9b6ca98046b301c56170ed27c3d6f15 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 23 Jul 2009 16:20:02 +0100 Subject: bitbake: Make sure regexp patterns are consistent in providers.py Signed-off-by: Richard Purdie --- bitbake-dev/lib/bb/providers.py | 3 +-- bitbake/lib/bb/providers.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bitbake-dev/lib/bb/providers.py b/bitbake-dev/lib/bb/providers.py index 879f1a00b..8970fb3be 100644 --- a/bitbake-dev/lib/bb/providers.py +++ b/bitbake-dev/lib/bb/providers.py @@ -299,11 +299,10 @@ def getRuntimeProviders(dataCache, rdepend): # Only search dynamic packages if we can't find anything in other variables for pattern in dataCache.packages_dynamic: - + pattern = pattern.replace('+', "\+") if pattern in regexp_cache: regexp = regexp_cache[pattern] else: - pattern = pattern.replace('+', "\+") try: regexp = re.compile(pattern) except: diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index 5785b704e..dac0b9abf 100644 --- a/bitbake/lib/bb/providers.py +++ b/bitbake/lib/bb/providers.py @@ -299,11 +299,10 @@ def getRuntimeProviders(dataCache, rdepend): # Only search dynamic packages if we can't find anything in other variables for pattern in dataCache.packages_dynamic: - + pattern = pattern.replace('+', "\+") if pattern in regexp_cache: regexp = regexp_cache[pattern] else: - pattern = pattern.replace('+', "\+") try: regexp = re.compile(pattern) except: -- cgit v1.2.3