mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
lib/oe: drop custom implementation of oe.path.relative
As we now require Python 2.7 and os.path.relpath() was added in 2.6 we can now drop the reimplementation in oe.path. oe.path.relative is simple now a wrapper that changes the order of the arguments and it's use discouraged. (From OE-Core rev: 1a03cd16401d2926bba902ffc5df30911b5c9394) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
eb1e41e68f
commit
b4455d8c61
|
@ -21,23 +21,7 @@ def relative(src, dest):
|
||||||
foo/bar
|
foo/bar
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if hasattr(os.path, "relpath"):
|
|
||||||
return os.path.relpath(dest, src)
|
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 = [ os.path.pardir ] * (len(srclist) - commonlen)
|
|
||||||
if commonlen < len(destlist):
|
|
||||||
# Add remaining portion
|
|
||||||
relpath += destlist[commonlen:]
|
|
||||||
|
|
||||||
return os.path.sep.join(relpath)
|
|
||||||
|
|
||||||
def make_relative_symlink(path):
|
def make_relative_symlink(path):
|
||||||
""" Convert an absolute symlink to a relative one """
|
""" Convert an absolute symlink to a relative one """
|
||||||
|
|
Loading…
Reference in New Issue
Block a user