Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ducking 'None' for missing module 

This handles the Windows-specific case, the next commit handles the general issue
This commit is contained in:
Michael Hirsch, Ph.D 2019-09-19 14:36:03 -04:00
parent f96a8cbdf5
commit 765a5e9835
No known key found for this signature in database
GPG Key ID: 6D23CDADAB0294F9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mesonbuild/mesonlib.py
View File

@ -1389,13 +1389,13 @@ class BuildDirLock:
msvcrt.locking(self.lockfile.fileno(), msvcrt.LK_UNLCK, 1) msvcrt.locking(self.lockfile.fileno(), msvcrt.LK_UNLCK, 1)
self.lockfile.close() self.lockfile.close()
def relpath(path, start): def relpath(path: str, start: str) -> str:
# On Windows a relative path can't be evaluated for paths on two different # On Windows a relative path can't be evaluated for paths on two different
# drives (i.e. c:\foo and f:\bar). The only thing left to do is to use the # drives (i.e. c:\foo and f:\bar). The only thing left to do is to use the
# original absolute path. # original absolute path.
try: try:
return os.path.relpath(path, start) return os.path.relpath(path, start)
except ValueError: except (TypeError, ValueError):
return path return path