diff --git a/builder/core/install_desktop.py b/builder/core/install_desktop.py index b08c6622..750f7750 100644 --- a/builder/core/install_desktop.py +++ b/builder/core/install_desktop.py @@ -30,22 +30,14 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__fil sys.path.insert(0, BASE_DIR) try: - # Import modules used by this function from builder.core.command_runner import run_command - # xbps_commands is likely not needed here as construct_xbps_install_args handles it internally - # from builder.core.xbps_commands import xbps_commands - # enable_services_in_chroot implementation might need checking/adaptation later from builder.core.enable_services import enable_services_in_chroot - # paths is passed as argument, so not needed as direct import here - # from builder.core.bootstrap.paths import paths - from builder.core.config_loader import load_yaml_config # Needed to load desktop YAML + from builder.core.config_loader import load_yaml_config from builder.configs import logger_config - from builder.core import bootstrap # Import bootstrap module for construct_xbps_install_args + from builder.core.bootstrap import bootstrap - # Module-level logger setup logger = logger_config.setup_logger('install_desktop') except ImportError as e: - # Handle import error for this module try: basic_logger = logging.getLogger(__name__) logging.basicConfig(level=logging.ERROR) @@ -54,9 +46,6 @@ except ImportError as e: print(f"Error importing necessary modules for install_desktop: {e}. Ensure your environment is set up correctly.") sys.exit(1) - -# MODIFIED FUNCTION SIGNATURE to accept arguments passed from iso_builder_main -# Matching the order and names from the intended call def install_desktop_environment(arch, desktop_environment_name, desktops_config, target_env='rootfs', paths=None, host_arch=None, repositories_data=None): """ Installs the specified desktop environment and enables associated services in the chroot system,