diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/sstate.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index a7cd9ec112..755bf590c4 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -213,7 +213,7 @@ def sstate_install(ss, d): | |||
213 | break | 213 | break |
214 | if realmatch: | 214 | if realmatch: |
215 | match.append(f) | 215 | match.append(f) |
216 | sstate_search_cmd = "grep -rl '%s' %s --exclude=master.list | sed -e 's:^.*/::' -e 's:\.populate-sysroot::'" % (f, d.expand("${SSTATE_MANIFESTS}")) | 216 | sstate_search_cmd = "grep -rlF '%s' %s --exclude=master.list | sed -e 's:^.*/::' -e 's:\.populate-sysroot::'" % (f, d.expand("${SSTATE_MANIFESTS}")) |
217 | search_output = subprocess.Popen(sstate_search_cmd, shell=True, stdout=subprocess.PIPE).communicate()[0] | 217 | search_output = subprocess.Popen(sstate_search_cmd, shell=True, stdout=subprocess.PIPE).communicate()[0] |
218 | if search_output != "": | 218 | if search_output != "": |
219 | match.append("Matched in %s" % search_output.rstrip()) | 219 | match.append("Matched in %s" % search_output.rstrip()) |
@@ -406,7 +406,7 @@ def sstate_clean_manifest(manifest, d): | |||
406 | elif os.path.exists(entry) and len(os.listdir(entry)) == 0: | 406 | elif os.path.exists(entry) and len(os.listdir(entry)) == 0: |
407 | os.rmdir(entry[:-1]) | 407 | os.rmdir(entry[:-1]) |
408 | else: | 408 | else: |
409 | oe.path.remove(entry) | 409 | os.remove(entry) |
410 | except OSError: | 410 | except OSError: |
411 | pass | 411 | pass |
412 | 412 | ||