mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

sstate: Fix various path manipulation issues

Browse Source 
Fix missing parameter to endswith and pass paths through normpath to remove
any duplicate "/" characters which would corrupt other calls like basename.

(From OE-Core rev: 172a74c540378149eec493c37c030e9f42f9603d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2012-11-14 15:52:45 +00:00
parent c176e5a3fe
commit aa75269454
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/sstate.bbclass
+5 -3
View File
@@ -110,11 +110,13 @@ def sstate_state_fromvars(d, task = None):
return ss return ss
def sstate_add(ss, source, dest, d): def sstate_add(ss, source, dest, d):
srcbase = os.path.basename(source) if not source.endswith("/"):
if not source.endswith:
source = source + "/" source = source + "/"
if not dest.endswith: if not dest.endswith("/"):
dest = dest + "/" dest = dest + "/"
source = os.path.normpath(source)
dest = os.path.normpath(dest)
srcbase = os.path.basename(source)
ss['dirs'].append([srcbase, source, dest]) ss['dirs'].append([srcbase, source, dest])
return ss return ss