Merge commit 'ff5cffeb' into reinout-relative-test

b69edf15 · Reinout van Rees · 259bc974 · ff5cffeb · b69edf15
Commit b69edf15 authored Oct 26, 2015 by Reinout van Rees
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

src/zc/buildout/easy_install.py src/zc/buildout/easy_install.py +2 -0

No files found.
--- a/src/zc/buildout/easy_install.py
+++ b/src/zc/buildout/easy_install.py
@@ -1152,6 +1152,8 @@ def _relative_path(common, path):
 def _relativitize(path, script, relative_paths):
    if path == script:
        raise AssertionError("path == script")
+    if path == relative_paths:
+        return "base"
    common = os.path.dirname(os.path.commonprefix([path, script]))
    if (common == relative_paths or
        common.startswith(os.path.join(relative_paths, ''))