From 93156fe8e70a8fd43b725fe4b7a39e991585569a Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Sat, 5 Mar 2022 11:29:33 -0500 Subject: [PATCH] minetest: Allow alternate name for 3d armor mod In Bookworm, the minetest-mod-player-3d-armor package is renamed to minetest-mod-3d-armor. Allow either package name to fulfill the requirement, so that the app is installable in both Bullseye and Bookworm. Fixes #2164. Signed-off-by: James Valleroy --- plinth/modules/minetest/__init__.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plinth/modules/minetest/__init__.py b/plinth/modules/minetest/__init__.py index 7aa1e032d..f18b75150 100644 --- a/plinth/modules/minetest/__init__.py +++ b/plinth/modules/minetest/__init__.py @@ -13,20 +13,21 @@ from plinth.daemon import Daemon from plinth.modules.backups.components import BackupRestore from plinth.modules.firewall.components import Firewall from plinth.modules.users.components import UsersAndGroups -from plinth.package import Packages +from plinth.package import Package, Packages from plinth.utils import format_lazy from . import manifest _mods = [ + Package('minetest-mod-3d-armor') | Package('minetest-mod-player-3d-armor'), 'minetest-mod-character-creator', 'minetest-mod-craftguide', 'minetest-mod-infinite-chest', 'minetest-mod-lucky-block', 'minetest-mod-maidroid', 'minetest-mod-mesecons', 'minetest-mod-moreblocks', 'minetest-mod-moreores', 'minetest-mod-nether', - 'minetest-mod-pipeworks', 'minetest-mod-player-3d-armor', - 'minetest-mod-protector', 'minetest-mod-quartz', 'minetest-mod-skyblock', - 'minetest-mod-throwing', 'minetest-mod-unified-inventory', - 'minetest-mod-unifieddyes', 'minetest-mod-worldedit' + 'minetest-mod-pipeworks', 'minetest-mod-protector', 'minetest-mod-quartz', + 'minetest-mod-skyblock', 'minetest-mod-throwing', + 'minetest-mod-unified-inventory', 'minetest-mod-unifieddyes', + 'minetest-mod-worldedit' ] _description = [