[apparmor] [patch] Get variable names in aa-mergeprof ask_the_questions() in sync with aa.py

[Steve Beattie]

On Fri, Jun 05, 2015 at 11:47:36PM +0200, Christian Boltz wrote:
> Hello,
> 
> Am Mittwoch, 3. Juni 2015 schrieb Steve Beattie:
> > On Mon, May 25, 2015 at 01:36:00PM +0200, Christian Boltz wrote:
> > > this patch adds two variable references (aa and changed) in
> > > aa-mergeprof ask_the_questions() so that the code can use the short
> > > name and be more in sync with aa.py ask_the_questions().
> > > 
> > > With this patch applied, the "for ruletype in ['capability',
> > > 'network']:" block is in sync, with the exception of the sections
> > > that intentionally differ:
> > > - the check for the profile mode
> > > - the default button selection based on profile mode
> > > - the seen_events counter
> > > 
> > > [ 30-mergeprof-sync-varnames.diff ]
> > 
> > I get why you're doing it, but it's a little goofy to convert only
> > some of the references to self.user.aa and apparmor.aa.changed in
> > aa-mergeprof::ask_the_questions() and not all of them. I'd personally
> > rather see a larger patch that converts all the references in
> > ask_the_questions().
> 
> As discussed on IRC, my plan was only to change sections that I touched 
> and tested in this patch series. Wearing my "you wanted it so" hat, 
> here's the updated patch that changes the variable names in the whole 
> ask_the_questions() function:
> 
> 
> Get variable names in aa-mergeprof ask_the_questions() in sync with aa.py
> 
> Add two variable references (aa and changed) in aa-mergeprof
> ask_the_questions() so that the code can use the short name and be more
> in sync with aa.py ask_the_questions().
> 
> With this patch applied, the "for ruletype in ['capability', 'network']:"
> block is in sync, with the exception of the sections that intentionally
> differ:
> - the check for the profile mode
> - the default button selection based on profile mode
> - the seen_events counter
> 
> The patch also includes some minor whitespace fixes.
> 
> [ 30-mergeprof-sync-varnames.diff ]

Acked-by: Steve Beattie <steve at nxnw.org>, thanks!

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20150608/d9287e33/attachment.pgp>