diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-04-18 13:47:50 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-04-22 08:35:12 +0200 |
| commit | bddf53105be7db2b1196342297b216c0e8652104 (patch) | |
| tree | affdd5c22a4d434294ac1c4bd24a3330e119d011 | |
| parent | 1cc18c6336cb01ac4d3482725073592a6be23468 (diff) | |
osx: Convert absolute paths to relative paths in the OSX file merger
| -rw-r--r-- | cerbero/tools/osxuniversalgenerator.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cerbero/tools/osxuniversalgenerator.py b/cerbero/tools/osxuniversalgenerator.py index ed96c3a..0351674 100644 --- a/cerbero/tools/osxuniversalgenerator.py +++ b/cerbero/tools/osxuniversalgenerator.py @@ -208,12 +208,9 @@ class OSXUniversalGenerator(object): os.symlink(target, dest) return - # if it's an absolute path replace the prefix - target = os.path.join(os.path.dirname(src), target) - src_prefix = src.split(filepath)[0] - dest_prefix = dest.split(filepath)[0] - rel_target = os.path.relpath(target, src_prefix) - dest_target = os.path.join(dest_prefix, rel_target) + # if it's an absolute path, make it relative for sanity + rel_path = os.path.relpath(os.path.dirname(target), os.path.dirname(dest)) + dest_target = os.path.join(rel_path, os.path.basename(target)) os.symlink(dest_target, dest) def _call(self, cmd, cwd=None): |