bitbake providers.py: Sync with upstream

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5125 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 6 insertions, 1 deletions

diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py
index 0ad5876ef0..3504efc86e 100644
--- a/bitbake/lib/bb/providers.py
+++ b/bitbake/lib/bb/providers.py
@@ -296,7 +296,12 @@ def getRuntimeProviders(dataCache, rdepend):
 
     # Only search dynamic packages if we can't find anything in other variables
     for pattern in dataCache.packages_dynamic:
-        regexp = re.compile(pattern)
+        pattern = pattern.replace('+', "\+")
+        try:
+            regexp = re.compile(pattern)
+        except:
+            bb.msg.error(bb.msg.domain.Provider, "Error parsing re expression: %s" % pattern)
+            raise
         if regexp.match(rdepend):
             rproviders += dataCache.packages_dynamic[pattern]