utils: remove aa-disable non-functional '-r' option

This patch removes the non-funcional -r option for aa-disable, as
well as the test and manpage documentation for it.

Signed-off-by: Steve Beattie <steve@nxnw.org>
Acked-by: Seth Arnold <seth.arnold@canonical.com>

utils/aa-disable

@@ -22,7 +22,6 @@ _ = init_translation()
 
 parser = argparse.ArgumentParser(description=_('Disable the profile for the given programs'))
 parser.add_argument('-d', '--dir', type=str, help=_('path to profiles'))
-parser.add_argument('-r', '--revert', action='store_true', help=_('enable the profile for the given programs'))
 parser.add_argument('program', type=str, nargs='+', help=_('name of program'))
 args = parser.parse_args()
 

utils/aa-disable.pod

@@ -35,10 +35,6 @@ B<-d --dir  /path/to/profiles>
    Specifies where to look for the AppArmor security profile set.
    Defaults to /etc/apparmor.d.
 
-B<-r --revert>
-
-   Enables the profile and loads it.  
-
 =head1 DESCRIPTION
 
 B<aa-disable> is used to I<disable> one or more profiles. 

utils/apparmor/tools.py

@@ -33,7 +33,6 @@ class aa_tools:
         if tool_name in ['audit', 'complain']:
             self.remove = args.remove
         elif tool_name == 'disable':
-            self.revert = args.revert
             self.disabledir = apparmor.profile_dir + '/disable'
             self.check_disable_dir()
         elif tool_name == 'autodep':

utils/test/minitools_test.py

@@ -97,12 +97,6 @@ class Test(unittest.TestCase):
 
         self.assertEqual(os.path.islink('./profiles/disable/%s'%os.path.basename(local_profilename)), True, 'Failed to create a symlink for %s in disable'%local_profilename)
 
-        #Enable the ntpd profile and check if it was correctly re-enabled
-        subprocess.check_output('%s ./../aa-disable -d ./profiles -r %s'%(python_interpreter, test_path), shell=True)
-
-        self.assertEqual(os.path.islink('./profiles/disable/%s'%os.path.basename(local_profilename)), False, 'Failed to remove a symlink for %s from disable'%local_profilename)
-
-
     def test_autodep(self):
         pass