mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 918869 - When the objdir is on a different drive from the source, write virtualenv paths as absolute paths (avoids "Error populating virtualenv"), r=gps
--HG-- rename : accessible/src/windows/sdn/sdnDocAccessible.cpp => accessible/src/windows/msaa/DocAccessibleWrap.cpp rename : accessible/src/windows/sdn/sdnDocAccessible.h => accessible/src/windows/msaa/DocAccessibleWrap.h extra : rebase_source : c650b4df2a745fa5ff7b6060355b2d5f4949846a
This commit is contained in:
parent
bcf0b47126
commit
4f80679247
@ -231,7 +231,11 @@ class VirtualenvManager(object):
|
||||
# relative path allows the srcdir/objdir combination
|
||||
# to be moved around (as long as the paths relative to
|
||||
# each other remain the same).
|
||||
f.write("%s\n" % os.path.relpath(path, python_lib))
|
||||
try:
|
||||
f.write("%s\n" % os.path.relpath(path, python_lib))
|
||||
except ValueError:
|
||||
# When objdir is on a separate drive, relpath throws
|
||||
f.write("%s\n" % os.path.join(python_lib, path))
|
||||
|
||||
return True
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user