manuel/builder_peppermint_void
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new commit

Browse Source
This commit is contained in:
Manuel 2025-04-28 01:49:20 +00:00
parent 4ae8b4e8f2
commit 816fbf1978
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builder/core/install_desktop.py
View File

@ -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) sys.path.insert(0, BASE_DIR)
try: try:
# Import modules used by this function
from builder.core.command_runner import run_command 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 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.config_loader import load_yaml_config
# from builder.core.bootstrap.paths import paths
from builder.core.config_loader import load_yaml_config # Needed to load desktop YAML
from builder.configs import logger_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') logger = logger_config.setup_logger('install_desktop')
except ImportError as e: except ImportError as e:
# Handle import error for this module
try: try:
basic_logger = logging.getLogger(__name__) basic_logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.ERROR) 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.") print(f"Error importing necessary modules for install_desktop: {e}. Ensure your environment is set up correctly.")
sys.exit(1) 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): 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, Installs the specified desktop environment and enables associated services in the chroot system,