From b20a14af097b777b2a72c8154996709c5cf0936d Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Thu, 1 Feb 2024 12:24:26 +0800 Subject: [PATCH] fix unnecessary or invalid openjdk installation scripts --- fdroidserver/checkupdates.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index f62c81fe..c7af23b3 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -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"] = ''