From d85997f858798cc5433c80ff564a01ba1d699f84 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 3 Sep 2008 11:21:49 +0000
Subject: bitbake providers.py: Sync with upstream
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5125 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
bitbake/lib/bb/providers.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'bitbake/lib/bb')
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py
index 0ad5876ef..3504efc86 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]
--
cgit v1.2.3