providers.py: Fix + character escaping from PACKAGES_DYNAMIC (thanks Otavio Salvador)

diff --git a/ChangeLog b/ChangeLog
index 324fc99..5b2f978 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 Changes in BitBake 1.8.x:
        - Add bb.utils.prune_suffix function
+       - Fix hg checkouts of specific revisions (from Poky)
+       - Fix wget fetching of urls with parameters specified (from Poky)
+       - Add username handling to git fetcher (from Poky)
+       - Set HOME environmental variable when running fetcher commands (from Poky)
+       - Make sure allowed variables inherited from the environment are exported again (from Poky)
+       - When running a stage task in bbshell, run populate_staging, not the stage task (from Poky)
+       - Fix + character escaping from PACKAGES_DYNAMIC (thanks Otavio Salvador)
  
 Changes in BitBake 1.8.12:
        - Fix -f (force) in conjunction with -b
@@ -76,12 +83,6 @@ Changes in BitBake 1.8.12:
          proxies to work better. (from Poky)
        - Also allow user and pswd options in SRC_URIs globally (from Poky)
        - Improve proxy handling when using mirrors (from Poky)
-       - Fix hg checkouts of specific revisions (from Poky)
-       - Fix wget fetching of urls with parameters specified (from Poky)
-       - Add username handling to git fetcher (from Poky)
-       - Set HOME environmental variable when running fetcher commands (from Poky)
-       - Make sure allowed variables inherited from the environment are exported again (from Poky)
-       - When running a stage task in bbshell, run populate_staging, not the stage task (from Poky)
 
 Changes in BitBake 1.8.10:
        - Psyco is available only for x86 - do not use it on other architectures.

diff --git a/lib/bb/providers.py b/lib/bb/providers.py
index 3e842ee..bb46f0b 100644 (file)
--- a/lib/bb/providers.py
+++ b/lib/bb/providers.py
@@ -297,9 +297,8 @@ 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('+', "\+")
         try:
-            regexp = re.compile(pattern)
+            regexp = re.compile(pattern.replace('+', "\+"))
         except:
             bb.msg.error(bb.msg.domain.Provider, "Error parsing re expression: %s" % pattern)
             raise