Click Apparmor

Merge lp:~sergiusens/click-apparmor/snappyFameworksDir into lp:click-apparmor

  1. snappyFameworksDir
  2. Merge into trunk
Proposed by Sergio Schvezov on 2015-06-03
Status: Merged
Approved by: Jamie Strandboge on 2015-06-12
Approved revision: 155
Merged at revision: 156
Proposed branch: lp:~sergiusens/click-apparmor/snappyFameworksDir
Merge into: lp:click-apparmor
Diff against target: 11 lines (+1/-1)
1 file modified
src/apparmor/click.py (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/click-apparmor/snappyFameworksDir
Reviewer Review Type Date Requested Status
Ubuntu Security Team 2015-06-03 Pending
Review via email: mp+261032@code.launchpad.net

Commit Message

Adding /frameworks for snappy based systems to look for packages

To post a comment you must log in.
Jamie Strandboge (jdstrand) wrote :

Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/apparmor/click.py'
2--- src/apparmor/click.py 2015-04-15 21:32:33 +0000
3+++ src/apparmor/click.py 2015-06-03 20:39:39 +0000
4@@ -542,7 +542,7 @@
5 # snappy hardcodes these and doing this allows snappy images to not require
6 # click
7 if os.path.exists("/usr/bin/snappy"):
8- return "{%s}" % ",".join(["/apps", "/oem"])
9+ return "{%s}" % ",".join(["/apps", "/oem", "/frameworks"])
10
11 from gi.repository import Click
12

Subscribers

People subscribed via source and target branches

to all changes: