diff options
author | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-12-21 10:51:04 +0000 |
---|---|---|
committer | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-12-21 10:51:04 +0000 |
commit | 0881297b891137242edc22348b639a284f0a6152 (patch) | |
tree | fe8de2d15defab8597429c874297dbfece5bb031 | |
parent | 644d8b28505842eb713bf402b455f751b15b6022 (diff) | |
download | buildstream-jmac/830-stop-resolving-symlinks.tar.gz |
utils.py: Stop resolving symlinks in _relative_symlink_targetjmac/830-stop-resolving-symlinks
See issue #830.
-rw-r--r-- | buildstream/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/utils.py b/buildstream/utils.py index 4da29c259..7686d2668 100644 --- a/buildstream/utils.py +++ b/buildstream/utils.py @@ -934,11 +934,11 @@ def _relative_symlink_target(root, symlink, target): # We want a relative path from the directory in which symlink # is located, not from the symlink itself. - symlinkdir, _ = os.path.split(_resolve_symlinks(symlink)) + symlinkdir, _ = os.path.split(symlink) # Create a full path to the target, including the leading staging # directory - fulltarget = os.path.join(_resolve_symlinks(root), target) + fulltarget = os.path.join(root, target) # now get the relative path from the directory where the symlink # is located within the staging root, to the target within the same |