Explorar o código

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

Richard Purdie %!s(int64=15) %!d(string=hai) anos
pai
achega
45acd91e3f
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 0
      ChangeLog
  2. 1 2
      lib/bb/providers.py

+ 1 - 0
ChangeLog

@@ -176,6 +176,7 @@ Changes in Bitbake 1.9.x:
 	- 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.0:
 	- Release 1.7.x as a stable series

+ 1 - 2
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