avoid test failure in execer.py:137 if cwd not on c: drive (in windows)

This commit is contained in:
Bob Hyman 2016-08-14 17:31:22 -04:00
parent f7e7e2a48f
commit 39ada82ba8
2 changed files with 5 additions and 1 deletions

1
.gitignore vendored
View file

@ -20,6 +20,7 @@ docs/_build/
docs/envvarsbody
docs/xontribsbody
xonsh/dev.githash
**/__pycache__/
# temporary files from vim and emacs
*~

View file

@ -133,7 +133,10 @@ class CommandsCache(abc.Mapping):
if os.path.isfile(full_name)
), None)
if local_bin:
return os.path.abspath(os.path.relpath(local_bin, cwd))
if os.path.splitdrive(cwd)[0] != os.path.splitdrive(local_bin)[0]: # if cwd not on same drive as bin
return os.path.abspath(local_bin) # avoid ValueError in relpath()
else:
return os.path.abspath(os.path.relpath(local_bin, cwd))
cached = next((cmd for cmd in possibilities if cmd in self._cmds_cache), None)
if cached: