Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 07:05:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

proton: Handle corrupted prefixes a little better

Browse Source
This commit is contained in:
Andrew Eikum 2018-11-30 09:24:43 -06:00
parent ad90a3686e
commit 414cffdfaf
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
proton
View File

@ -60,28 +60,40 @@ def upgrade_pfx(old_ver):
if old_ver is None: if old_ver is None:
return return
old_proton_ver, old_prefix_ver = old_ver.split('-') if not '-' in old_ver:
old_proton_maj, old_proton_min = old_proton_ver.split('.') #How can this happen??
new_proton_ver, new_prefix_ver = CURRENT_PREFIX_VERSION.split('-') log("Prefix has an invalid version?! You may want to back up user files and delete this prefix.")
new_proton_maj, new_proton_min = new_proton_ver.split('.') #If it does, just let the Wine upgrade happen and hope it works...
if int(new_proton_maj) < int(old_proton_maj) or \
(int(new_proton_maj) == int(old_proton_maj) and \
int(new_proton_min) < int(old_proton_min)):
log("Removing newer prefix")
if old_proton_ver == "3.7" and not os.path.exists(os.environ["STEAM_COMPAT_DATA_PATH"] + "/tracked_files"):
#proton 3.7 did not generate tracked_files, so copy it into place first
shutil.copy(basedir + "/proton_3.7_tracked_files", os.environ["STEAM_COMPAT_DATA_PATH"] + "/tracked_files")
remove_tracked_files(os.environ["STEAM_COMPAT_DATA_PATH"])
return return
if old_proton_ver == "3.7" and old_prefix_ver == "1": try:
if not os.path.exists(prefix + "/drive_c/windows/syswow64/kernel32.dll"): old_proton_ver, old_prefix_ver = old_ver.split('-')
#shipped a busted 64-bit-only installation on 20180822. detect and wipe clean old_proton_maj, old_proton_min = old_proton_ver.split('.')
log("Detected broken 64-bit-only installation, re-creating prefix.") new_proton_ver, new_prefix_ver = CURRENT_PREFIX_VERSION.split('-')
shutil.rmtree(prefix) new_proton_maj, new_proton_min = new_proton_ver.split('.')
if int(new_proton_maj) < int(old_proton_maj) or \
(int(new_proton_maj) == int(old_proton_maj) and \
int(new_proton_min) < int(old_proton_min)):
log("Removing newer prefix")
if old_proton_ver == "3.7" and not os.path.exists(os.environ["STEAM_COMPAT_DATA_PATH"] + "/tracked_files"):
#proton 3.7 did not generate tracked_files, so copy it into place first
shutil.copy(basedir + "/proton_3.7_tracked_files", os.environ["STEAM_COMPAT_DATA_PATH"] + "/tracked_files")
remove_tracked_files(os.environ["STEAM_COMPAT_DATA_PATH"])
return return
if old_proton_ver == "3.7" and old_prefix_ver == "1":
if not os.path.exists(prefix + "/drive_c/windows/syswow64/kernel32.dll"):
#shipped a busted 64-bit-only installation on 20180822. detect and wipe clean
log("Detected broken 64-bit-only installation, re-creating prefix.")
shutil.rmtree(prefix)
return
except ValueError:
log("Prefix has an invalid version?! You may want to back up user files and delete this prefix.")
#Just let the Wine upgrade happen and hope it works...
return
def run_wine(args): def run_wine(args):
subprocess.call(args, env=env, stderr=lfile) subprocess.call(args, env=env, stderr=lfile)