Merge lp:~nskaggs/music-app/unconfined-again into lp:music-app/trusty

[Nicholas Skaggs]

Revert back to unconfined again, temporarily.

Revert back to unconfined again, with Jamie's blessing. This is temporary.

We will seek a permanent solution to apparmor issues with test running as part of the mediascanner 2 landing

[Victor Thompson (vthompson)]

With all these transitions from confinement to unconfinement and vice versa, I'm starting to think the Music app is into bondage.

lgtm.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:476
http://91.189.93.70:8080/job/music-app-ci/827/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/51

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/827/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:476
http://91.189.93.70:8080/job/music-app-ci/828/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/52

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/828/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:476
http://91.189.93.70:8080/job/music-app-ci/830/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/54

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/830/rebuild

review: Approve (continuous-integration)

=== modified file 'click/apparmor.json'
--- click/apparmor.json	2014-05-09 16:41:29 +0000
+++ click/apparmor.json	2014-05-30 14:26:09 +0000
@@ -1,19 +1,5 @@
 {
     "policy_version": 1.1,
-    "policy_groups": [
-        "audio",
-        "music_files_read",
-        "networking",
-        "usermetrics"
-    ],
-    "read_path": [
-      "/etc/fstab",
-      "/proc/[0-9]*/mounts",
-      "/usr/share/grilo-plugins/",
-      "@{HOME}/.cache/media-art/",
-      "@{HOME}/.cache/mediascanner/"
-    ],
-    "write_path": [
-      "@{HOME}/.local/share/grilo-plugins/"
-    ]
+    "template": "unconfined",
+    "policy_groups": []
 }