Merge lp:~osomon/webbrowser-app/xdg_download_dir into lp:webbrowser-app

[Olivier Tilloy]

Refer to @{XDG_DOWNLOAD_DIR} in the browser’s apparmor profile instead of hardcoding "Downloads" in English.

Note: this is not enough to fully address bug #1535666. We’re still missing a mechanism that automatically sets the value of @{XDG_DOWNLOAD_DIR} based on the user’s locale (third bullet point in https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/1061693/comments/1).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1361
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2629/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1382
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1382
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1382/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1382
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5017
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6613
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6613/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27828

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2629/rebuild

review: Needs Fixing (continuous-integration)

[Jamie Strandboge (jdstrand)]

This looks fine. Note, you only need to specify this in write_path since it includes 'r'.

review: Approve

[lp:~osomon/webbrowser-app/xdg_download_dir]

1362. By Olivier Tilloy on 2016-02-23

Remove Downloads dir entry from read_path as this generates duplicated entries in the profile.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1362
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2630/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6613
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1383
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1383/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1383
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5021
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6624
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6624/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27843

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2630/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/webbrowser-app-apparmor.manifest'
--- debian/webbrowser-app-apparmor.manifest	2016-01-28 22:12:45 +0000
+++ debian/webbrowser-app-apparmor.manifest	2016-02-23 21:43:24 +0000
@@ -32,11 +32,10 @@
         "/usr/share/applications/",
         "/custom/vendor/here/location-provider/consent/*.html",
         "@{HOME}/.local/share/applications/",
-        "@{HOME}/Downloads/",
         "/sys/devices/**/input*/"
       ],
       "write_path": [
-        "@{HOME}/Downloads/"
+        "@{HOME}/@{XDG_DOWNLOAD_DIR}/"
       ]
     }
   }