summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-07-19 17:58:18 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-07-19 17:58:18 +0000
commitac40dabb22b6dd6a85c57933f4097e111a8d49a5 (patch)
tree792e4742a4d99579b17cf5f52d860e75c2f42ff0
parent1501addb048501716c300ca7422135d11e977252 (diff)
downloadbitbake-contrib-ac40dabb22b6dd6a85c57933f4097e111a8d49a5.tar.gz
providers.py: When a regexp fails to compile for PACKAGES_DYNAMIC, print a more useful error (#4444)
-rw-r--r--ChangeLog1
-rw-r--r--lib/bb/providers.py6
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a58b38e93..44889e3e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -141,6 +141,7 @@ Changes in Bitbake 1.9.x:
- Make sure expandKeys has been called on the data dictonary before running tasks
- Correctly add a task override in the form task-TASKNAME.
- Revert the '-' character fix in class names since it breaks things
+ - When a regexp fails to compile for PACKAGES_DYNAMIC, print a more useful error (#4444)
Changes in Bitbake 1.8.0:
- Release 1.7.x as a stable series
diff --git a/lib/bb/providers.py b/lib/bb/providers.py
index 0ad5876ef..1bd1a39fa 100644
--- a/lib/bb/providers.py
+++ b/lib/bb/providers.py
@@ -296,7 +296,11 @@ 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)
+ 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]