Skip to content

Commit 7f5ac11

Browse files
thw26ctrlaltf24
andauthored
feat: Wine 10 (#266)
* Permit Wine 10.0 Stable * fix: support release candidates as well --------- Co-authored-by: Nathan Shaaban <[email protected]>
1 parent 60416aa commit 7f5ac11

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

ou_dedetai/config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1135,4 +1135,4 @@ def icu_latest_version(self) -> str:
11351135

11361136
@property
11371137
def icu_latest_version_url(self) -> str:
1138-
return self._network.icu_latest_version().download_url
1138+
return self._network.icu_latest_version().download_url

ou_dedetai/wine.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,11 @@ def get_wine_release(binary: str) -> tuple[Optional[WineRelease], str]:
7474

7575
if release is not None:
7676
ver_major = int(version.split('.')[0].lstrip('wine-')) # remove 'wine-'
77-
ver_minor = int(version.split('.')[1])
77+
ver_minor_str = version.split('.')[1]
78+
# In the case the version is an rc like wine-10.0-rc5
79+
if '-' in ver_minor_str:
80+
ver_minor_str = ver_minor_str.split("-")[0]
81+
ver_minor = int(ver_minor_str)
7882
release = release.lstrip('(').rstrip(')').lower() # remove parens
7983
else:
8084
ver_major = 0
@@ -131,7 +135,8 @@ def check_wine_rules(
131135
WineRule(major=7, proton=True, minor_bad=[], allowed_releases=["staging"]),
132136
# devel permissible at this point
133137
WineRule(major=8, proton=False, minor_bad=[0], allowed_releases=["staging"], devel_allowed=16), #noqa: E501
134-
WineRule(major=9, proton=False, minor_bad=[], allowed_releases=["devel", "staging"]) #noqa: E501
138+
WineRule(major=9, proton=False, minor_bad=[], allowed_releases=["devel", "staging"]), #noqa: E501
139+
WineRule(major=10, proton=False, minor_bad=[], allowed_releases=["stable", "devel", "staging"])
135140
]
136141

137142
major_min, minor_min = required_wine_minimum

0 commit comments

Comments
 (0)