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

aa-mergeprof: don't ask for includes that are already there

Browse Source 
Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
Christian Boltz 2014-10-16 20:22:52 +02:00
parent 4f9183b23e
commit 4f4eded593
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
utils/aa-mergeprof
View File

@ -239,7 +239,12 @@ class Merge(object):
#Add the file-wide includes from the other profile to the user profile #Add the file-wide includes from the other profile to the user profile
done = False done = False
options = list(map(lambda inc: '#include <%s>' %inc, sorted(other.filelist[other.filename]['include'].keys())))
options = []
for inc in other.filelist[other.filename]['include'].keys():
if not inc in self.user.filelist[self.user.filename]['include'].keys():
options.append('#include <%s>' %inc)
default_option = 1 default_option = 1
q = aaui.PromptQuestion() q = aaui.PromptQuestion()
@ -267,7 +272,12 @@ class Merge(object):
for hat in sorted(other.aa[profile].keys()): for hat in sorted(other.aa[profile].keys()):
#Add the includes from the other profile to the user profile #Add the includes from the other profile to the user profile
done = False done = False
options = list(map(lambda inc: '#include <%s>' %inc, sorted(other.aa[profile][hat]['include'].keys())))
options = []
for inc in other.aa[profile][hat]['include'].keys():
if not inc in self.user.aa[profile][hat]['include'].keys():
options.append('#include <%s>' %inc)
default_option = 1 default_option = 1
q = aaui.PromptQuestion() q = aaui.PromptQuestion()