This is an automated email from the ASF dual-hosted git repository. root pushed a commit to branch jmac/830-stop-resolving-symlinks in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 0881297b891137242edc22348b639a284f0a6152 Author: Jim MacArthur <[email protected]> AuthorDate: Fri Dec 21 10:51:04 2018 +0000 utils.py: Stop resolving symlinks in _relative_symlink_target See issue #830. --- buildstream/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildstream/utils.py b/buildstream/utils.py index 4da29c2..7686d26 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
