[apparmor] [PATCH] add --include-template-dir and --include-policy-groups-dir to easyprof

[Steve Beattie]

On Fri, Mar 27, 2015 at 05:15:25PM -0500, Jamie Strandboge wrote:
> Author: Jamie Strandboge <jamie at canonical.com>
> Description: add --include-templates-dir and --include-policy-groups-dir
>  options to easyprof to support framework policy on snappy
> Forwarded: no
> 
> Index: apparmor-2.9.1/utils/aa-easyprof
> ===================================================================
> --- apparmor-2.9.1.orig/utils/aa-easyprof
> +++ apparmor-2.9.1/utils/aa-easyprof
> @@ -1,7 +1,7 @@
>  #! /usr/bin/env python
>  # ------------------------------------------------------------------
>  #
> -#    Copyright (C) 2011-2013 Canonical Ltd.
> +#    Copyright (C) 2011-2015 Canonical Ltd.
>  #
>  #    This program is free software; you can redistribute it and/or
>  #    modify it under the terms of version 2 of the GNU General Public

At the very least, the following addition is needed:

Index: b/utils/aa-easyprof
===================================================================
--- a/utils/aa-easyprof
+++ b/utils/aa-easyprof
@@ -10,7 +10,7 @@
 # ------------------------------------------------------------------
 
 import apparmor.easyprof
-from apparmor.easyprof import AppArmorException, error
+from apparmor.easyprof import AppArmorException, error, warn
 import os
 import sys
 

as pyflakes whines about the missing declaration for warn.

> @@ -68,16 +68,38 @@ if __name__ == "__main__":
>              apparmor.easyprof.print_basefilenames(easyp.get_templates())
>              sys.exit(0)
>          elif options.template and options.show_template:

-- 
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/20150327/b30cd5be/attachment.pgp>