mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-06 17:31:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2971 commits 23 branches 109 tags 32 MiB
Commit graph

10 commits

Author SHA1 Message Date
Christian Boltz
9e4c01f8d3 Add a warning to aa-mergeprof --help that the syntax will change in the 
future. Also remove --auto, which is not implemented yet.
 2014-09-04 01:49:47 +02:00
Christian Boltz
356e7cb199 aa-mergeprof: honor -d parameter 
(it was ignored until now)

Acked-by: Kshitij Gupta <kgupta8592@gmail.com>.
 2014-08-04 20:19:08 +02:00
Christian Boltz
241544ad8a modify aa-mergeprof to: 
- allow users to merge two profiles (2-way merge) using aa-mergeprof by
  making the third profile optional
- re-enable code that cleaned up base and other profile and using it in
  deleted count (was disabled due to pyflakes thinking it was unused)

Patch by Kshitij Gupta <kgupta8592@gmail.com>


Acked-by: Christian Boltz <apparmor@cboltz.de>
 2014-07-29 12:39:12 +02:00
Christian Boltz
be6cb6724d fix aa-mergeprof to 
- import apparmor.ui as aaui
- call aaui.UI_*() instead of apparmor.aa.UI_*()
- use apparmor.aamode.AA_MAY_EXEC instead of apparmor.aa.AA_MAY_EXEC


Acked-by: Kshitij Gupta <kgupta8592@gmail.com>.
 2014-07-28 00:24:26 +02:00
Steve Beattie
ec7676bdec utils/aa-*: adjust python shebang lines to ease rewriting to an 
alternate python if installed via the python-tools-setup.py script.
 2014-02-14 14:42:19 -08:00
Steve Beattie
f652178a02 aa-mergeprof: fixup some of the whitespace issues 2014-02-13 08:31:59 -08:00
Steve Beattie
d318ff6100 Fix up last pyflakes issues with tools 2014-02-13 08:24:02 -08:00
Steve Beattie
15a95e3b36 Fix up some more pyflakes issues with the tools 2014-02-13 08:20:59 -08:00
Steve Beattie
32e0931588 Fix up execute permissions that were lost in the merger for some reason. 2014-02-12 16:59:27 -08:00
Steve Beattie
f989dd0132 Merge in Kshitij Gupta <kgupta8592@gmail.com>'s rewrite of the 
logprof/genprof and related utilities in python. Because the branch that
was worked on was not based on the apparmor tree, not all of the history
can be maintained for files that are not newly created or entirely
rewritten in the branch.

(This merge also includes a subsequent commit to the branch
I was merging from which includes my missed bzr add of
utils/apparmor/translations.py)
 2014-02-12 15:54:00 -08:00