On Thu, Sep 04, 2014 at 01:18:13AM +0200, Christian Boltz wrote: > Hello, > > this patch adds a warning to aa-mergeprof --help that the syntax will > change in the future. It also removes --auto, which is not implemented > yet. > > Note: I intentionally didn't mark the warning for translation because > it will go away soon (hopefully). > > BTW @Kshitij: Any news on the aa-mergeprof patch to change the syntax? >
Acked-by: Seth Arnold <[email protected]> Thanks > > === modified file 'utils/aa-mergeprof' > --- utils/aa-mergeprof 2014-08-04 18:19:08 +0000 > +++ utils/aa-mergeprof 2014-09-03 23:13:29 +0000 > @@ -26,12 +26,13 @@ > from apparmor.translations import 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('base', type=str, help=_('base 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('-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() > > # 2-way merge or 3-way merge based on number of params > @@ -51,7 +52,8 @@ > #Get rid of common/superfluous stuff > 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: > mergeprofiles.ask_the_questions('other') > > > > Regards, > > Christian Boltz > -- > > über browser?, wie wärs mit (ISDN)Telefon - ich hab da reboot und > > rcsmpppd restart > Habe ich mir auch schon überlegt! Aber die Vorstellung war dann doch > etwas komisch: "Ja, Schatz! Ich komme gleich ins Bett! Muss nur noch > kurz meinen Router (unterm Tisch) anrufen, damit er runterfährt!" > [> Andre Fischer und Michael Frank in suse-linux] > > > -- > AppArmor mailing list > [email protected] > Modify settings or unsubscribe at: > https://lists.ubuntu.com/mailman/listinfo/apparmor >
signature.asc
Description: Digital signature
-- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
