From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sat, 3 Nov 2012 17:03:14 +0000 (+0000)
Subject: sstate: Be consistent about sstate-inputdirs/outputdirs ending with '/'
X-Git-Tag: 2015-4~8713
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0109a3623a19f9ae289952a4f054e53c3eca4eaa;p=openembedded-core.git

sstate: Be consistent about sstate-inputdirs/outputdirs ending with '/'

The manifest file can become corrupted if sstate-inputdirs and sstate-outputdirs
don't have matching endings. This patch ensures that even if set incorrectly,
the code functions as intended, thereby handling manifest corruption safely.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index cbb14e1177..2f31526828 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -111,6 +111,10 @@ def sstate_state_fromvars(d, task = None):
 
 def sstate_add(ss, source, dest, d):
     srcbase = os.path.basename(source)
+    if not source.endswith:
+         source = source + "/"
+    if not dest.endswith:
+         dest = dest + "/"
     ss['dirs'].append([srcbase, source, dest])
     return ss