mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-28 12:58:07 +00:00
Code Issues Releases Wiki Activity

Merge branch 'cboltz-drop-localinclude' into 'master'

Browse Source 
Drop 'localinclude' in parse_profile_data() and ProfileStorage

See merge request apparmor/apparmor!427

Acked-by: John Johansen <john.johansen@canonical.com> for 2.12..master
Acked-by: Steve Beattie <steve@nxnw.org> for 2.12..master

(cherry picked from commit b017f8f8a9fadc63d983814a44016aeb9dd57475)

001ea9e3 Drop 'localinclude' in parse_profile_data() and ProfileStorage
This commit is contained in:
Christian Boltz 2019-11-18 21:32:24 +00:00
parent ae74d9344a
commit fd50663ec5
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/apparmor/aa.py
View File

@ -2365,8 +2365,6 @@ def parse_profile_data(data, file, do_include):
elif re_match_include(line): elif re_match_include(line):
# Include files # Include files
include_name = re_match_include(line) include_name = re_match_include(line)
if include_name.startswith('local/'):
profile_data[profile][hat]['localinclude'][include_name] = True
if profile: if profile:
profile_data[profile][hat]['include'][include_name] = True profile_data[profile][hat]['include'][include_name] = True

1
utils/apparmor/profile_storage.py
View File

@ -54,7 +54,6 @@ class ProfileStorage:
data['alias'] = dict() data['alias'] = dict()
data['abi'] = [] data['abi'] = []
data['include'] = dict() data['include'] = dict()
data['localinclude'] = dict()
data['lvar'] = dict() data['lvar'] = dict()
data['repo'] = dict() data['repo'] = dict()