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

Fixes from rev70..72

Browse Source
This commit is contained in:
Kshitij Gupta
2013-09-22 23:49:19 +05:30
parent 4debd1ea79
commit 93d59eb6eb
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/aa-cleanprof
View File

@@ -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)

4
Tools/aa-logprof
View File

@@ -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()

2
Tools/aa-mergeprof
View File

@@ -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]

2
Tools/manpages/aa-cleanprof.pod
View File

@@ -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