diff --git a/hassio/addons/addon.py b/hassio/addons/addon.py index 8edf45d8c..40a838dd5 100644 --- a/hassio/addons/addon.py +++ b/hassio/addons/addon.py @@ -554,7 +554,7 @@ class Addon(CoreSysAttributes): with TemporaryDirectory(dir=self.sys_config.path_tmp) as tmp_folder: profile_file = Path(tmp_folder, 'apparmor.txt') - adjust_profile(self.slug, self.path_apparmor, self.profile_file) + adjust_profile(self.slug, self.path_apparmor, profile_file) await self.sys_host.apparmor.load_profile(self.slug, profile_file) @property diff --git a/hassio/host/apparmor.py b/hassio/host/apparmor.py index 2b39368c2..2d8193b5f 100644 --- a/hassio/host/apparmor.py +++ b/hassio/host/apparmor.py @@ -66,7 +66,7 @@ class AppArmorControl(CoreSysAttributes): async def load_profile(self, profile_name, profile_file): """Load/Update a new/exists profile into AppArmor.""" - if not validate_profile(profile_file, profile_name): + if not validate_profile(profile_name, profile_file): _LOGGER.error("profile is not valid with name %s", profile_name) raise HostAppArmorError() diff --git a/hassio/utils/apparmor.py b/hassio/utils/apparmor.py index aa80a4d59..a9137cb06 100644 --- a/hassio/utils/apparmor.py +++ b/hassio/utils/apparmor.py @@ -14,8 +14,8 @@ def get_profile_name(profile_file): profiles = set() try: - with profile_file.open('r') as profile: - for line in profile: + with profile_file.open('r') as profile_data: + for line in profile_data: match = RE_PROFILE.match(line) if not match: continue @@ -31,14 +31,14 @@ def get_profile_name(profile_file): return profiles.pop() -def validate_profile(profile_file, profile_name): +def validate_profile(profile_name, profile_file): """Check if profile from file is valid with profile name.""" if profile_name == get_profile_name(profile_file): return True return False -def adjust_profile(profile_file, profile_name, profile_new): +def adjust_profile(profile_name, profile_file, profile_new): """Fix the profile name.""" org_profile = get_profile_name(profile_file) profile_data = []