opensourcemirror
/
fdroid-server
mirror of https://gitlab.com/fdroid/fdroidserver.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix unnecessary or invalid openjdk installation scripts

This commit is contained in:
proletarius101 2024-02-01 12:24:26 +08:00 committed by Jochen Sprickerhof
parent f2bdf5214a
commit b20a14af09
No known key found for this signature in database
GPG Key ID: 5BFFDCC258E69433
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fdroidserver/checkupdates.py
View File

@ -617,7 +617,13 @@ def checkupdates_app(app: metadata.App) -> None:
if not gotcur:
newbuilds = copy.deepcopy(builds[-len(vercodes):])
# These are either built-in or invalid in newer system versions
bookworm_blocklist = [
'apt-get install -y openjdk-11-jdk',
'apt-get install openjdk-11-jdk-headless',
'apt-get install -y openjdk-11-jdk-headless',
'apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless',
'apt-get install -y -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless',
'apt-get install -y openjdk-17-jdk',
'apt-get install openjdk-17-jdk-headless',
'apt-get install -y openjdk-17-jdk-headless',
@ -626,7 +632,7 @@ def checkupdates_app(app: metadata.App) -> None:
for build in newbuilds:
if "sudo" in build:
if any("openjdk-11" in line for line in build["sudo"]):
if any("openjdk-11" in line for line in build["sudo"]) or any("openjdk-17" in line for line in build["sudo"]):
build["sudo"] = [line for line in build["sudo"] if line not in bookworm_blocklist]
if build["sudo"] == ['apt-get update']:
build["sudo"] = ''