diff options
| author | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2012-11-16 18:14:20 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-05 15:33:35 +0000 |
| commit | acdd76482efc3caf80e9e0b7359be7ca724ae09a (patch) | |
| tree | d9803e48e47500735ecee765f621648d3906bf86 | |
| parent | fa5be9499f047f492cc6b07abf16908e321b259e (diff) | |
| download | openembedded-core-acdd76482efc3caf80e9e0b7359be7ca724ae09a.tar.gz openembedded-core-acdd76482efc3caf80e9e0b7359be7ca724ae09a.tar.bz2 openembedded-core-acdd76482efc3caf80e9e0b7359be7ca724ae09a.zip | |
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@sigma-chemnitz.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | 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 6de35e6dc9..967ae9b559 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))) |