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 0000000..5601fe3 Binary files /dev/null and b/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/__pycache__/main.cpython-314.pyc differ 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