[oe-commits] Enrico Scholz : sstate.bbclass: fixed file-conflict check

[git at git.openembedded.org]

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

Author: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
Date:   Fri Nov 16 18:14:20 2012 +0100

sstate.bbclass: fixed file-conflict check

The value of subprocess.Popen().communicate()[0] is a string.
Checking for '!= None' will always match causing bogus warnings
regarding already staged files.

Signed-off-by: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/sstate.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 6de35e6..967ae9b 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -171,7 +171,7 @@ def sstate_install(ss, d):
                 sstate_search_cmd = "grep -rl %s %s --exclude=master.list | sed -e 's:^.*/::' -e 's:\.populate-sysroot::'" % (f, d.expand("${SSTATE_MANIFESTS}"))
                 cmd_array = sstate_search_cmd.split(' ')
                 search_output = subprocess.Popen(cmd_array, stdout=subprocess.PIPE).communicate()[0]
-                if search_output != None:
+                if search_output != "":
                     match.append("Matched in %s" % search_output.rstrip())
     if match:
         bb.warn("The recipe %s is trying to install files into a shared area when those files already exist. Those files and their manifest location are:\n   %s\nPlease verify which package should provide the above files." % (d.getVar('PN', True), "\n   ".join(match)))