Hello,
Am Mittwoch, 15. Oktober 2014 schrieb Christian Boltz:
> Remaining known issues I noticed while testing:
> - aa-mergeprof always asks for includes, even if they are already
> there
The attached patch fixes this ;-)
> - CMD_OTHER should work ;-)
to avoid the list gets shorter:
- aa-mergeprof always asks to save the profile, even if there were no
changes
Regards,
Christian Boltz
--
looks like you have some special code in yast for password "x", maybe I
should use the even more secure new password "y" in the future ?! ;-)
[Harald Koenig in https://bugzilla.novell.com/show_bug.cgi?id=148464]
--- aa-mergeprof__MERGED+fixes 2014-10-15 22:23:51.029502379 +0200
+++ aa-mergeprof 2014-10-15 23:09:33.267213910 +0200
@@ -258,7 +258,12 @@ class Merge(object):
#Add the file-wide includes from the other profile to the user profile
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
q = aaui.PromptQuestion()
@@ -288,7 +293,12 @@ class Merge(object):
for hat in sorted(other.aa[profile].keys()):
#Add the includes from the other profile to the user profile
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
q = aaui.PromptQuestion()
--
AppArmor mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/apparmor
