From 3aff47039f8ff6ae0f68d6e0e9d3c7178616a884 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Thu, 6 Mar 2025 12:58:21 -0800 Subject: [PATCH] upgrades: Simplify some global names Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/upgrades/distupgrade.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/plinth/modules/upgrades/distupgrade.py b/plinth/modules/upgrades/distupgrade.py index 376672b3b..3a5e5cb6f 100644 --- a/plinth/modules/upgrades/distupgrade.py +++ b/plinth/modules/upgrades/distupgrade.py @@ -19,11 +19,11 @@ logger = logging.getLogger(__name__) SOURCES_LIST = '/etc/apt/sources.list' -DIST_UPGRADE_OBSOLETE_PACKAGES: list[str] = [] +OBSOLETE_PACKAGES: list[str] = [] -DIST_UPGRADE_PACKAGES_WITH_PROMPTS = ['firewalld', 'minidlna', 'radicale'] +PACKAGES_WITH_PROMPTS = ['firewalld', 'minidlna', 'radicale'] -DIST_UPGRADE_PRE_DEBCONF_SELECTIONS: list[str] = [ +PRE_DEBCONF_SELECTIONS: list[str] = [ # Tell grub-pc to continue without installing grub again. 'grub-pc grub-pc/install_devices_empty boolean true' ] @@ -176,7 +176,7 @@ def _services_disable(): @contextlib.contextmanager def _apt_hold_packages(): """Apt hold some packages during dist upgrade.""" - packages = DIST_UPGRADE_PACKAGES_WITH_PROMPTS + packages = PACKAGES_WITH_PROMPTS packages_string = ', '.join(packages) # Hold freedombox package during entire dist upgrade. @@ -197,11 +197,9 @@ def _apt_hold_packages(): def _debconf_set_selections() -> None: """Pre-set debconf selections if they are needed for dist upgrade.""" - if DIST_UPGRADE_PRE_DEBCONF_SELECTIONS: - logger.info('Setting debconf selections: %s', - DIST_UPGRADE_PRE_DEBCONF_SELECTIONS) - action_utils.debconf_set_selections( - DIST_UPGRADE_PRE_DEBCONF_SELECTIONS) + if PRE_DEBCONF_SELECTIONS: + logger.info('Setting debconf selections: %s', PRE_DEBCONF_SELECTIONS) + action_utils.debconf_set_selections(PRE_DEBCONF_SELECTIONS) def _packages_remove_obsolete() -> None: @@ -209,9 +207,9 @@ def _packages_remove_obsolete() -> None: These may prevent other packages from upgrading. """ - if DIST_UPGRADE_OBSOLETE_PACKAGES: - logger.info('Removing packages: %s...', DIST_UPGRADE_OBSOLETE_PACKAGES) - _apt_run(['remove'] + DIST_UPGRADE_OBSOLETE_PACKAGES) + if OBSOLETE_PACKAGES: + logger.info('Removing packages: %s...', OBSOLETE_PACKAGES) + _apt_run(['remove'] + OBSOLETE_PACKAGES) def _apt_update():