From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 23 Jul 2009 15:20:02 +0000 (+0100)
Subject: bitbake: Make sure regexp patterns are consistent in providers.py
X-Git-Tag: 2011-1~7177
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=699ad056d9b6ca98046b301c56170ed27c3d6f15;p=openembedded-core.git

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 879f1a00b2..8970fb3be1 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 5785b704ed..dac0b9abf2 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: