From 15a95e3b368d888c966acd593ed5ddbc30ca0e47 Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Thu, 13 Feb 2014 08:20:59 -0800 Subject: [PATCH] Fix up some more pyflakes issues with the tools --- utils/aa-genprof | 4 ++-- utils/aa-mergeprof | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/aa-genprof b/utils/aa-genprof index b10b8e03f..c38e614bd 100755 --- a/utils/aa-genprof +++ b/utils/aa-genprof @@ -155,8 +155,8 @@ while not done_profiling: for p in sorted(apparmor.helpers.keys()): if apparmor.helpers[p] == 'enforce': - enforce(p) - reload(p) + apparmor.enforce(p) + apparmor.reload(p) apparmor.UI_Info(_('\nReloaded AppArmor profiles in enforce mode.')) apparmor.UI_Info(_('\nPlease consider contributing your new profile!\nSee the following wiki page for more information:')+'\nhttp://wiki.apparmor.net/index.php/Profiles\n') diff --git a/utils/aa-mergeprof b/utils/aa-mergeprof index 75839561a..9fc059a0c 100755 --- a/utils/aa-mergeprof +++ b/utils/aa-mergeprof @@ -13,7 +13,7 @@ # # ---------------------------------------------------------------------- import argparse -import sys +import re import apparmor.aa import apparmor.aamode @@ -492,7 +492,7 @@ class Merge(object): if match: inc = match deleted = 0 - deleted = apparmor.aa.delete_duplicates(aa[profile][hat], inc) + deleted = apparmor.aa.delete_duplicates(self.user.aa[profile][hat], inc) self.user.aa[profile][hat]['include'][inc] = True apparmor.aa.changed[profile] = True apparmor.aa.UI_Info(_('Adding %s to profile.') % path)