summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2012-11-16 18:14:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-05 15:34:06 +0000
commit306761b0261c73a046c151740fbd20f6815aeb51 (patch)
treeaf262e1e2b017f9668a869dd923c7ea50ee24760 /meta
parenta5b720c4d4e285df69bfed377935c1e29520645d (diff)
downloadpoky-306761b0261c73a046c151740fbd20f6815aeb51.tar.gz
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. (From OE-Core rev: acdd76482efc3caf80e9e0b7359be7ca724ae09a) Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sstate.bbclass2
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)))