diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-23 16:20:02 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-23 16:20:02 +0100 |
| commit | 699ad056d9b6ca98046b301c56170ed27c3d6f15 (patch) | |
| tree | 085dd4e61bbc7a44b69bcdb1b3f82ff9c406d232 | |
| parent | d02379d2df13801cde08a32fde5deec8201538d2 (diff) | |
| download | openembedded-core-699ad056d9b6ca98046b301c56170ed27c3d6f15.tar.gz openembedded-core-699ad056d9b6ca98046b301c56170ed27c3d6f15.tar.bz2 openembedded-core-699ad056d9b6ca98046b301c56170ed27c3d6f15.tar.xz openembedded-core-699ad056d9b6ca98046b301c56170ed27c3d6f15.zip | |
bitbake: Make sure regexp patterns are consistent in providers.py
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | bitbake-dev/lib/bb/providers.py | 3 | ||||
| -rw-r--r-- | bitbake/lib/bb/providers.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/bitbake-dev/lib/bb/providers.py b/bitbake-dev/lib/bb/providers.py index 879f1a00b..8970fb3be 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 5785b704e..dac0b9abf 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: |