aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2010-04-18 20:02:21 -0700
committerChris Larson <chris_larson@mentor.com>2010-04-23 14:20:42 -0700
commit5c923fd35c369bae929fc0e110121abeaffab493 (patch)
tree79f6b10769f09ec41df182466a1538b57aa6d7c7 /lib
parent707bbb0667edfc9df15863286a02f64adfb5544d (diff)
downloadopenembedded-5c923fd35c369bae929fc0e110121abeaffab493.tar.gz
openembedded-5c923fd35c369bae929fc0e110121abeaffab493.tar.bz2
openembedded-5c923fd35c369bae929fc0e110121abeaffab493.zip
oe.path.relative: switch to a different appraoch
Signed-off-by: Chris Larson <clarson@kergoth.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/oe/path.py35
1 files changed, 16 insertions, 19 deletions
diff --git a/lib/oe/path.py b/lib/oe/path.py
index 48c4b9b633..8433ee11f5 100644
--- a/lib/oe/path.py
+++ b/lib/oe/path.py
@@ -1,10 +1,12 @@
def join(*paths):
"""Like os.path.join but doesn't treat absolute RHS specially"""
- import os.path
- return os.path.normpath("/".join(paths))
+ from os import sep
+ from os.path import normpath
-def relative(src, dest):
- """ Return a relative path from src to dest.
+ return normpath(sep.join(paths))
+
+def relative(src, dest=None):
+ """ Return a relative path from src to dest(default=cwd).
>>> relative("/usr/bin", "/tmp/foo/bar")
../../tmp/foo/bar
@@ -15,25 +17,20 @@ def relative(src, dest):
>>> relative("/tmp", "/tmp/foo/bar")
foo/bar
"""
- import os.path
+ if dest is None:
+ dest = getcwd()
if hasattr(os.path, "relpath"):
return os.path.relpath(dest, src)
else:
- destlist = os.path.normpath(dest).split(os.path.sep)
- srclist = os.path.normpath(src).split(os.path.sep)
-
- # Find common section of the path
- common = os.path.commonprefix([destlist, srclist])
- commonlen = len(common)
-
- # Climb back to the point where they differentiate
- relpath = [ pardir ] * (len(srclist) - commonlen)
- if commonlen < len(destlist):
- # Add remaining portion
- relpath += destlist[commonlen:]
-
- return sep.join(relpath)
+ from os import getcwd, sep
+ from os.path import abspath, normpath
+
+ srclist = abspath(src).split(sep)
+ destlist = abspath(dest).split(sep)
+ loc = [spath == dpath for spath, dpath in zip(srclist, destlist)].index(False)
+ rellist = ([ ".." ] * (len(srclist) - loc)) + destlist[loc:]
+ return sep.join(rellist)
def format_display(path, metadata):
""" Prepare a path for display to the user. """