mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
This commit is contained in:
Christian Boltz 2019-11-18 21:32:24 +00:00
commit b017f8f8a9
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

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

1
utils/apparmor/profile_storage.py
View file

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