mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-30 22:05:27 +00:00
Code Issues Releases Wiki Activity

Merge branch 'cboltz-less-hashers' into 'master'

Browse Source 
change 'profile_changes' and 'serialize_opts' to dict()

See merge request apparmor/apparmor!63

Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2018-01-26 16:18:32 +00:00
parent f8a174c08b 7f1007d13e
commit a3db7f8acb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/apparmor/aa.py
View File

@@ -103,7 +103,7 @@ extras = hasher() # Inactive profiles from extras
### end our ### end our
log_pid = dict() # handed over to ReadLog, gets filled in logparser.py. The only case the previous content of this variable _might_(?) be used is aa-genprof (multiple do_logprof_pass() runs) log_pid = dict() # handed over to ReadLog, gets filled in logparser.py. The only case the previous content of this variable _might_(?) be used is aa-genprof (multiple do_logprof_pass() runs)
profile_changes = hasher() profile_changes = dict()
prelog = hasher() prelog = hasher()
changed = dict() changed = dict()
created = [] created = []
@@ -721,7 +721,7 @@ def sync_profile():
repo_profiles = [] repo_profiles = []
changed_profiles = [] changed_profiles = []
new_profiles = [] new_profiles = []
serialize_opts = hasher() serialize_opts = dict()
status_ok, ret = fetch_profiles_by_user(cfg['repository']['url'], status_ok, ret = fetch_profiles_by_user(cfg['repository']['url'],
cfg['repository']['distro'], user) cfg['repository']['distro'], user)
if not status_ok: if not status_ok: