From 93d59eb6eb98e5f68982e291a0adcd3f16ab1a13 Mon Sep 17 00:00:00 2001 From: Kshitij Gupta Date: Sun, 22 Sep 2013 23:49:19 +0530 Subject: [PATCH] Fixes from rev70..72 --- Tools/aa-cleanprof | 2 +- Tools/aa-logprof | 4 ++-- Tools/aa-mergeprof | 2 +- Tools/manpages/aa-cleanprof.pod | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tools/aa-cleanprof b/Tools/aa-cleanprof index 8f3d1fb1f..c90f61ab7 100644 --- a/Tools/aa-cleanprof +++ b/Tools/aa-cleanprof @@ -7,7 +7,7 @@ import apparmor.tools parser = argparse.ArgumentParser(description=_('Cleanup the profiles for the given programs')) parser.add_argument('-d', '--dir', type=str, help=_('path to profiles')) parser.add_argument('program', type=str, nargs='+', help=_('name of program')) -parser.add_argument('-s', '--silent', action='store_true', help=_('Silently over-write with a clean profile')) +parser.add_argument('-s', '--silent', action='store_true', help=_('Silently overwrite with a clean profile')) args = parser.parse_args() clean = apparmor.tools.aa_tools('cleanprof', args) diff --git a/Tools/aa-logprof b/Tools/aa-logprof index abdf1fec8..cf5d6e60e 100644 --- a/Tools/aa-logprof +++ b/Tools/aa-logprof @@ -20,8 +20,8 @@ if not aa_mountpoint: raise apparmor.AppArmorException(_('It seems AppArmor was not started. Please enable AppArmor and try again.')) if profiledir: - apparmor.profiledir = apparmor.get_full_path(profiledir) - if not os.path.isdir(apparmor.profiledir): + apparmor.profile_dir = apparmor.get_full_path(profiledir) + if not os.path.isdir(apparmor.profile_dir): raise apparmor.AppArmorException("%s is not a directory."%profiledir) apparmor.loadincludes() diff --git a/Tools/aa-mergeprof b/Tools/aa-mergeprof index 8168fb154..e8dcd3e67 100644 --- a/Tools/aa-mergeprof +++ b/Tools/aa-mergeprof @@ -12,7 +12,7 @@ parser.add_argument('mine', type=str, help=_('your profile')) parser.add_argument('base', type=str, help=_('base profile')) parser.add_argument('other', type=str, help=_('other profile')) parser.add_argument('-d', '--dir', type=str, help=_('path to profiles')) -parser.add_argument('-auto', action='store_true', help=_('Automatically merge profiles, exits incase of *x conflicts')) +parser.add_argument('-a', '--auto', action='store_true', help=_('Automatically merge profiles, exits incase of *x conflicts')) args = parser.parse_args() profiles = [args.mine, args.base, args.other] diff --git a/Tools/manpages/aa-cleanprof.pod b/Tools/manpages/aa-cleanprof.pod index 8d1ad30ec..1651b5a55 100644 --- a/Tools/manpages/aa-cleanprof.pod +++ b/Tools/manpages/aa-cleanprof.pod @@ -17,7 +17,7 @@ B<-d --dir /path/to/profiles> B<-s --silent> - Silently over-writes the profile without user prompt. + Silently overwrites the profile without user prompt. =head1 DESCRIPTION