diff --git a/utils/apparmor/aa.py b/utils/apparmor/aa.py index b85737ba4..7a82c1922 100644 --- a/utils/apparmor/aa.py +++ b/utils/apparmor/aa.py @@ -1392,11 +1392,6 @@ def ask_conflict_mode(profile, hat, old_profile, merge_profile): done = True -def get_include_path(incname): - if incname.startswith('/'): - return incname - return profile_dir + '/' + incname - def match_includes(profile, rule_type, rule_obj): ''' propose abstractions that allow the given rule_obj diff --git a/utils/apparmor/rule/include.py b/utils/apparmor/rule/include.py index 07551c10a..f2cb76e0c 100644 --- a/utils/apparmor/rule/include.py +++ b/utils/apparmor/rule/include.py @@ -128,7 +128,6 @@ class IncludeRule(BaseRule): def get_full_paths(self, profile_dir): ''' get list of full paths of an include (can contain multiple paths if self.path is a directory) ''' - # currently this section is based on aa.py get_include_path() (with variable names changed) # TODO: improve/fix logic to honor magic vs. quoted include paths if self.path.startswith('/'): full_path = self.path