From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 11 Jun 2015 22:01:48 +0000 (+0100)
Subject: multilib_global: Stop empty space influencing RPROVIDES
X-Git-Tag: 2015-10~1561
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=fe10ea6bd6078828016d3954ad9b290f638d6dbb;p=openembedded-core.git

multilib_global: Stop empty space influencing RPROVIDES

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>
---

diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index 8ea2a5a4b8..67bd70d293 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -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():