From 47fd849319cbdc2055537324b6e5e07630c681a7 Mon Sep 17 00:00:00 2001 From: n0toose Date: Wed, 18 Jan 2023 21:04:27 +0100 Subject: [PATCH] Fix AppArmor name-related exceptions (#4078) - 'Too many' is misleading if there are no profiles. - profiles just returns set() -- using profile_file should be more correct. --- supervisor/utils/apparmor.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/supervisor/utils/apparmor.py b/supervisor/utils/apparmor.py index 52889289c..fd7047e60 100644 --- a/supervisor/utils/apparmor.py +++ b/supervisor/utils/apparmor.py @@ -25,9 +25,15 @@ def get_profile_name(profile_file): f"Can't read AppArmor profile: {err}", _LOGGER.error ) from err + if len(profiles) == 0: + raise AppArmorInvalidError( + f"Missing AppArmor profile inside file: {profile_file.name}", _LOGGER.error + ) + if len(profiles) != 1: raise AppArmorInvalidError( - f"To many profiles inside file: {profiles}", _LOGGER.error + f"Too many AppArmor profiles inside file: {profile_file.name}", + _LOGGER.error, ) return profiles.pop()