Merge lp:~snappy-dev/click/binapparmor into lp:~snappy-dev/click/snappy
Proposed by
Barry Warsaw
Status: | Merged |
---|---|
Merged at revision: | 583 |
Proposed branch: | lp:~snappy-dev/click/binapparmor |
Merge into: | lp:~snappy-dev/click/snappy |
Diff against target: |
372 lines (+202/-16) 4 files modified
click/build.py (+18/-4) click/tests/test_build.py (+175/-11) click/tests/test_database.py (+2/-1) debian/changelog (+7/-0) |
To merge this branch: | bzr merge lp:~snappy-dev/click/binapparmor |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Hunt | Pending | ||
Jamie Strandboge | Pending | ||
Michael Vogt | Pending | ||
Review via email: mp+243875@code.launchpad.net |
Description of the change
click (0.4.35+ppa27) vivid; urgency=medium
* Give binaries default apparmor and apparmor-profile keys in their
manifest when explicit profiles are not present in packages.yaml
-- Barry Warsaw <email address hidden> Fri, 05 Dec 2014 16:53:51 -0500
With test cases! :)
I also repaired the test suite for Python 2.7 (tox) as bonus.
To post a comment you must log in.
The changelog entry is confusing, but it looks like the code DTRT. We should not be autogenerating the apparmor-profile key, only apparmor when apparmor and apparmor-profile aren't already present.