Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-26 14:45:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

proton: Don't copy library permissions

Browse Source 
These need to be writable.
This commit is contained in:
Andrew Eikum 2020-07-28 12:30:14 -05:00
parent d620a32883
commit c39b1fc34e
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
proton
View File

@ -70,6 +70,22 @@ def try_copy(src, dst):
else: else:
raise raise
def try_copyfile(src, dst):
try:
if os.path.isdir(dst):
dstfile = dst + "/" + os.path.basename(src)
if os.path.lexists(dstfile):
os.remove(dstfile)
elif os.path.lexists(dst):
os.remove(dst)
shutil.copyfile(src, dst)
except PermissionError as e:
if e.errno == errno.EPERM:
#be forgiving about permissions errors; if it's a real problem, things will explode later anyway
log('Error while copying to \"' + dst + '\": ' + e.strerror)
else:
raise
def getmtimestr(*path_fragments): def getmtimestr(*path_fragments):
path = os.path.join(*path_fragments) path = os.path.join(*path_fragments)
try: try:
@ -263,7 +279,7 @@ class CompatData:
#Just let the Wine upgrade happen and hope it works... #Just let the Wine upgrade happen and hope it works...
return return
def real_copy(self, src, dst, dll_copy=False): def pfx_copy(self, src, dst, dll_copy=False):
if os.path.islink(src): if os.path.islink(src):
contents = os.readlink(src) contents = os.readlink(src)
if os.path.dirname(contents).endswith(('/lib/wine', '/lib/wine/fakedlls', '/lib64/wine', '/lib64/wine/fakedlls')): if os.path.dirname(contents).endswith(('/lib/wine', '/lib/wine/fakedlls', '/lib64/wine', '/lib64/wine/fakedlls')):
@ -271,11 +287,11 @@ class CompatData:
# make the destination an absolute symlink # make the destination an absolute symlink
contents = os.path.normpath(os.path.join(os.path.dirname(src), contents)) contents = os.path.normpath(os.path.join(os.path.dirname(src), contents))
if dll_copy: if dll_copy:
try_copy(src, dst) try_copyfile(src, dst)
else: else:
os.symlink(contents, dst) os.symlink(contents, dst)
else: else:
try_copy(src, dst) try_copyfile(src, dst)
def copy_pfx(self): def copy_pfx(self):
with open(self.tracked_files_file, "w") as tracked_files: with open(self.tracked_files_file, "w") as tracked_files:
@ -291,12 +307,12 @@ class CompatData:
src_file = os.path.join(src_dir, dir_) src_file = os.path.join(src_dir, dir_)
dst_file = os.path.join(dst_dir, dir_) dst_file = os.path.join(dst_dir, dir_)
if os.path.islink(src_file) and not os.path.exists(dst_file): if os.path.islink(src_file) and not os.path.exists(dst_file):
self.real_copy(src_file, dst_file) self.pfx_copy(src_file, dst_file)
for file_ in files: for file_ in files:
src_file = os.path.join(src_dir, file_) src_file = os.path.join(src_dir, file_)
dst_file = os.path.join(dst_dir, file_) dst_file = os.path.join(dst_dir, file_)
if not os.path.exists(dst_file): if not os.path.exists(dst_file):
self.real_copy(src_file, dst_file) self.pfx_copy(src_file, dst_file)
tracked_files.write(rel_dir + file_ + "\n") tracked_files.write(rel_dir + file_ + "\n")
def update_builtin_libs(self, dll_copy_patterns): def update_builtin_libs(self, dll_copy_patterns):
@ -328,7 +344,7 @@ class CompatData:
else: else:
os.makedirs(dst_dir, exist_ok=True) os.makedirs(dst_dir, exist_ok=True)
dll_copy = any(fnmatch.fnmatch(file_, pattern) for pattern in dll_copy_patterns) dll_copy = any(fnmatch.fnmatch(file_, pattern) for pattern in dll_copy_patterns)
self.real_copy(src_file, dst_file, dll_copy) self.pfx_copy(src_file, dst_file, dll_copy)
tracked_name = rel_dir + file_ tracked_name = rel_dir + file_
if tracked_name not in prev_tracked_files: if tracked_name not in prev_tracked_files:
tracked_files.write(tracked_name + "\n") tracked_files.write(tracked_name + "\n")