[oe-commits] Richard Purdie : sstate: Fix various path manipulation issues
git at git.openembedded.org
git at git.openembedded.org
Wed Nov 14 15:59:30 UTC 2012
Module: openembedded-core.git
Branch: master-next
Commit: 172a74c540378149eec493c37c030e9f42f9603d
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=172a74c540378149eec493c37c030e9f42f9603d
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Wed Nov 14 15:52:45 2012 +0000
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 at linuxfoundation.org>
---
meta/classes/sstate.bbclass | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 2f31526..c1925b2 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
More information about the Openembedded-commits
mailing list