[oe-commits] Richard Purdie : multilib_global: Stop empty space influencing RPROVIDES

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: b73b9e5c3b2dd800d30a3b01937e6546a39cde6c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b73b9e5c3b2dd800d30a3b01937e6546a39cde6c

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu Jun 11 23:01:48 2015 +0100

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 at linuxfoundation.org>

---

 meta/classes/multilib_global.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index 8ea2a5a..67bd70d 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():