]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstate: Fix various path manipulation issues
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 14 Nov 2012 15:52:45 +0000 (15:52 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 14 Nov 2012 15:56:53 +0000 (15:56 +0000)
Fix missing parameter to endswith and pass paths through normpath to remove
any duplicate "/" characters which would corrupt other calls like basename.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/sstate.bbclass

index 2f31526828ad0d72c511e2c6c5f50c06eaafb96d..c1925b2a53d64df6cf4b238405f007ea64fc123c 100644 (file)
@@ -110,11 +110,13 @@ def sstate_state_fromvars(d, task = None):
     return ss
 
 def sstate_add(ss, source, dest, d):
-    srcbase = os.path.basename(source)
-    if not source.endswith:
+    if not source.endswith("/"):
          source = source + "/"
-    if not dest.endswith:
+    if not dest.endswith("/"):
          dest = dest + "/"
+    source = os.path.normpath(source)
+    dest = os.path.normpath(dest)
+    srcbase = os.path.basename(source)
     ss['dirs'].append([srcbase, source, dest])
     return ss