diff options
Diffstat (limited to 'meta/classes/sstate.bbclass')
-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): | |||
171 | sstate_search_cmd = "grep -rl %s %s --exclude=master.list | sed -e 's:^.*/::' -e 's:\.populate-sysroot::'" % (f, d.expand("${SSTATE_MANIFESTS}")) | 171 | sstate_search_cmd = "grep -rl %s %s --exclude=master.list | sed -e 's:^.*/::' -e 's:\.populate-sysroot::'" % (f, d.expand("${SSTATE_MANIFESTS}")) |
172 | cmd_array = sstate_search_cmd.split(' ') | 172 | cmd_array = sstate_search_cmd.split(' ') |
173 | search_output = subprocess.Popen(cmd_array, stdout=subprocess.PIPE).communicate()[0] | 173 | search_output = subprocess.Popen(cmd_array, stdout=subprocess.PIPE).communicate()[0] |
174 | if search_output != None: | 174 | if search_output != "": |
175 | match.append("Matched in %s" % search_output.rstrip()) | 175 | match.append("Matched in %s" % search_output.rstrip()) |
176 | if match: | 176 | if match: |
177 | 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))) | 177 | 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))) |