From b32d0f17f07f6de8773ca2379c3d65645da95237 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Thu, 23 Sep 2021 19:55:25 -0700 Subject: [PATCH] *: Use allow/denylist instead white/blacklist in comments Signed-off-by: Sunil Mohan Adapa Reviewed-by: Joseph Nuthalapati --- plinth/actions.py | 2 +- plinth/setup.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plinth/actions.py b/plinth/actions.py index 1827b04a5..fb4977e72 100644 --- a/plinth/actions.py +++ b/plinth/actions.py @@ -9,7 +9,7 @@ Actions run commands with this contract (version 1.1): This guarantees that we can only select from the correct set of actions. -3. (restriction) Only whitelisted actions can run. +3. (restriction) Only specifically allowed actions can run. A. Scripts in a directory above the actions directory can't be run. diff --git a/plinth/setup.py b/plinth/setup.py index fe50ca410..d1f651a0e 100644 --- a/plinth/setup.py +++ b/plinth/setup.py @@ -373,7 +373,7 @@ class ForceUpgrader(): - Package is complete. - File is available. - Package is trusted. - - Package is not blacklisted. + - Package is not in denylist. - Package extension is .deb. - Get conffiles values from control data of .deb. - Read from /var/lib/dpkg/status, Package and Conffiles section. @@ -385,11 +385,11 @@ class ForceUpgrader(): Filtering of packages to upgrade is done as follows: - Packages is upgradable. - - Remove packages from blacklist - - Remove packages unless in whitelist or whitelist is empty + - Remove packages from denylist + - Remove packages unless in allowlist or allowlist is empty - Package in allowed origins - Don't consider packages that require restart (if configured). - - Package dependencies satisfy origins, blacklist and whitelist. + - Package dependencies satisfy origins, denylist and allowlist. - Order packages alphabetically (order changes when upgrading in minimal steps).