diff options
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r-- | meta/classes/sstate.bbclass | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index e87f3c05ab..6762e32cfb 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -174,7 +174,7 @@ def sstate_installpkg(ss, d): | |||
174 | sstatepkg = d.getVar('SSTATE_PKG', True) + '_' + ss['name'] + ".tgz" | 174 | sstatepkg = d.getVar('SSTATE_PKG', True) + '_' + ss['name'] + ".tgz" |
175 | 175 | ||
176 | if not os.path.exists(sstatepkg): | 176 | if not os.path.exists(sstatepkg): |
177 | pstaging_fetch(sstatefetch, sstatepkg, d) | 177 | pstaging_fetch(sstatefetch, sstatepkg, d) |
178 | 178 | ||
179 | if not os.path.isfile(sstatepkg): | 179 | if not os.path.isfile(sstatepkg): |
180 | bb.note("Staging package %s does not exist" % sstatepkg) | 180 | bb.note("Staging package %s does not exist" % sstatepkg) |
@@ -259,10 +259,10 @@ def sstate_clean_manifest(manifest, d): | |||
259 | # so we ignore errors here. | 259 | # so we ignore errors here. |
260 | try: | 260 | try: |
261 | if entry.endswith("/"): | 261 | if entry.endswith("/"): |
262 | if os.path.islink(entry[:-1]): | 262 | if os.path.islink(entry[:-1]): |
263 | os.remove(entry[:-1]) | 263 | os.remove(entry[:-1]) |
264 | elif os.path.exists(entry) and len(os.listdir(entry)) == 0: | 264 | elif os.path.exists(entry) and len(os.listdir(entry)) == 0: |
265 | os.rmdir(entry[:-1]) | 265 | os.rmdir(entry[:-1]) |
266 | else: | 266 | else: |
267 | oe.path.remove(entry) | 267 | oe.path.remove(entry) |
268 | except OSError: | 268 | except OSError: |
@@ -314,14 +314,14 @@ python sstate_cleanall() { | |||
314 | 314 | ||
315 | for manifest in (os.listdir(manifest_dir)): | 315 | for manifest in (os.listdir(manifest_dir)): |
316 | if fnmatch.fnmatch(manifest, manifest_pattern): | 316 | if fnmatch.fnmatch(manifest, manifest_pattern): |
317 | name = manifest.replace(manifest_pattern[:-1], "") | 317 | name = manifest.replace(manifest_pattern[:-1], "") |
318 | namemap = d.getVar('SSTATETASKNAMES', True).split() | 318 | namemap = d.getVar('SSTATETASKNAMES', True).split() |
319 | tasks = d.getVar('SSTATETASKS', True).split() | 319 | tasks = d.getVar('SSTATETASKS', True).split() |
320 | if name not in namemap: | 320 | if name not in namemap: |
321 | continue | 321 | continue |
322 | taskname = tasks[namemap.index(name)] | 322 | taskname = tasks[namemap.index(name)] |
323 | shared_state = sstate_state_fromvars(d, taskname[3:]) | 323 | shared_state = sstate_state_fromvars(d, taskname[3:]) |
324 | sstate_clean(shared_state, d) | 324 | sstate_clean(shared_state, d) |
325 | } | 325 | } |
326 | 326 | ||
327 | def sstate_hardcode_path(d): | 327 | def sstate_hardcode_path(d): |