]> code.ossystems Code Review - openembedded-core.git/commitdiff
multilib_global: Stop empty space influencing RPROVIDES
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 11 Jun 2015 22:01:48 +0000 (23:01 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 16 Jun 2015 13:20:17 +0000 (14:20 +0100)
If the resulting RPROVIDES is empty, don't set it. This streamlines
pkgdata slightly removing empty values and avoids other errors which
confuse the datastore when the variable is best left unset.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/multilib_global.bbclass

index 8ea2a5a4b8b21fc0e617a2b85466c893adb4b711..67bd70d293a271794b496ab0e3d8c34b985f3f87 100644 (file)
@@ -142,7 +142,8 @@ python multilib_virtclass_handler_global () {
             origrprovs = rprovs = e.data.getVar("RPROVIDES", True) or ""
             for clsextend in clsextends:
                 rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES", setvar=False)
-            e.data.setVar("RPROVIDES", rprovs)
+            if rprovs.strip():
+                e.data.setVar("RPROVIDES", rprovs)
 
            # Process RPROVIDES_${PN}...
             for pkg in (e.data.getVar("PACKAGES", True) or "").split():