bitbake: Make sure regexp patterns are consistent in providers.py

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/bitbake-dev/lib/bb/providers.py b/bitbake-dev/lib/bb/providers.py
index 879f1a00b2df54c265c2f7be8045ad42e19ac384..8970fb3be1fdab9f92bdf2956c81d1c49fc88d7e 100644 (file)
--- 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 5785b704eddafbafce88097f0a1307b71637517e..dac0b9abf2edd131868e8839749f6bb329c821ea 100644 (file)
--- 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: