From 6d28e35d06d83c701548052516a9b93d4a26b71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= Date: Mon, 6 Jul 2026 20:07:32 +0200 Subject: [PATCH] chore: fix CodeQL findings - Remove unused sys import (basestrap/main.py) - Remove unused target_env_call import (packages/main.py) - Remove unused progress_match variable in both files - Remove dead if False: callback branch (basestrap/main.py) --- .../basestrap/__pycache__/main.cpython-314.pyc | Bin 0 -> 26094 bytes .../usr/lib/calamares/modules/basestrap/main.py | 11 ++--------- .../usr/lib/calamares/modules/packages/main.py | 5 +---- 3 files changed, 3 insertions(+), 13 deletions(-) create mode 100644 iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/__pycache__/main.cpython-314.pyc diff --git a/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/__pycache__/main.cpython-314.pyc b/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/__pycache__/main.cpython-314.pyc new file mode 100644 index 0000000000000000000000000000000000000000..5601fe31bd4d3f7db300839e1b06ce00107f0d95 GIT binary patch literal 26094 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 literal 0 HcmV?d00001 diff --git a/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py b/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py index 61ad401..c0199f9 100644 --- a/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py +++ b/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py @@ -19,7 +19,7 @@ import abc from string import Template -import os, shutil, subprocess, sys +import os, shutil, subprocess import libcalamares from libcalamares.utils import host_env_process_output, target_env_process_output @@ -262,9 +262,6 @@ class PMPacman(PackageManager): backend = "pacman" def __init__(self): - import re - progress_match = re.compile("^\\((\\d+)/(\\d+)\\)") - def line_cb(line): if line.startswith(":: "): self.in_package_changes = "package" in line or "hooks" in line @@ -313,11 +310,7 @@ class PMPacman(PackageManager): while pacman_count <= self.pacman_num_retries: pacman_count += 1 try: - if False: # callback: - host_env_process_output(command, self.line_cb) - else: - host_env_process_output(command) - + host_env_process_output(command) return except subprocess.CalledProcessError: if pacman_count <= self.pacman_num_retries: diff --git a/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/packages/main.py b/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/packages/main.py index f814102..f643860 100644 --- a/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/packages/main.py +++ b/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/packages/main.py @@ -21,7 +21,7 @@ from string import Template import subprocess import libcalamares -from libcalamares.utils import check_target_env_call, target_env_call +from libcalamares.utils import check_target_env_call from libcalamares.utils import gettext_path, gettext_languages import gettext @@ -166,9 +166,6 @@ class PMPacman(PackageManager): backend = "pacman" def __init__(self): - import re - progress_match = re.compile("^\\((\\d+)/(\\d+)\\)") - def line_cb(line): if line.startswith(":: "): self.in_package_changes = "package" in line or "hooks" in line