From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 14 Nov 2012 15:52:45 +0000 (+0000)
Subject: sstate: Fix various path manipulation issues
X-Git-Tag: 2015-4~8710
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=172a74c540378149eec493c37c030e9f42f9603d;p=openembedded-core.git

sstate: Fix various path manipulation issues

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>
---

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 2f31526828..c1925b2a53 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -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