Commit 9e4c01f8 authored by Christian Boltz's avatar Christian Boltz

Add a warning to aa-mergeprof --help that the syntax will change in the

future. Also remove --auto, which is not implemented yet.
parent 29c776e4
...@@ -26,12 +26,13 @@ import apparmor.ui as aaui ...@@ -26,12 +26,13 @@ import apparmor.ui as aaui
from apparmor.translations import init_translation from apparmor.translations import init_translation
_ = init_translation() _ = init_translation()
parser = argparse.ArgumentParser(description=_('Perform a 2-way or 3-way merge on the given profiles')) parser = argparse.ArgumentParser(description=_('Perform a 2-way or 3-way merge on the given profiles'),
epilog='WARNING: the arguments will change in a future version!')
parser.add_argument('mine', type=str, help=_('your profile')) parser.add_argument('mine', type=str, help=_('your profile'))
parser.add_argument('base', type=str, help=_('base profile')) parser.add_argument('base', type=str, help=_('base profile'))
parser.add_argument('other', nargs='?', type=str, help=_('other profile')) parser.add_argument('other', nargs='?', type=str, help=_('other profile'))
parser.add_argument('-d', '--dir', type=str, help=_('path to profiles')) parser.add_argument('-d', '--dir', type=str, help=_('path to profiles'))
parser.add_argument('-a', '--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() args = parser.parse_args()
# 2-way merge or 3-way merge based on number of params # 2-way merge or 3-way merge based on number of params
...@@ -51,7 +52,8 @@ def main(): ...@@ -51,7 +52,8 @@ def main():
#Get rid of common/superfluous stuff #Get rid of common/superfluous stuff
mergeprofiles.clear_common() mergeprofiles.clear_common()
if not args.auto: # if not args.auto:
if 1 == 1: # workaround to avoid lots of whitespace changes
if merge_mode == 3: if merge_mode == 3:
mergeprofiles.ask_the_questions('other') mergeprofiles.ask_the_questions('other')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment