Merge lp:~townsend/libertine/fix-dir-perms into lp:libertine

[Christopher Townsend]

Explicitly create .config/dconf and the common XDG data directories in the user container's mapped home directory in order to make sure the file permissions are correct.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:231
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/238/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/241
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/200
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/200
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/200
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/200
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1136/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/238/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

lgtm

review: Approve

=== modified file 'python/libertine/ChrootContainer.py'
--- python/libertine/ChrootContainer.py	2016-05-16 19:47:30 +0000
+++ python/libertine/ChrootContainer.py	2016-05-20 14:44:34 +0000
@@ -210,7 +210,7 @@
             % (utils.get_libertine_container_userdata_dir_path(self.container_id), home_path)
         )
 
-        xdg_user_dirs = ['Documents', 'Music', 'Pictures', 'Videos']
+        xdg_user_dirs = utils.get_common_xdg_directories()
         for user_dir in xdg_user_dirs:
             user_dir_path = os.path.join(home_path, user_dir)
             bind_mounts += " -b %s:%s" % (user_dir_path, user_dir_path)

=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2016-05-11 17:26:27 +0000
+++ python/libertine/LxcContainer.py	2016-05-20 14:44:34 +0000
@@ -225,7 +225,7 @@
         # Bind mount the user's home directory
         self.container.append_config_item("lxc.mount.entry", home_entry)
 
-        xdg_user_dirs = ['Documents', 'Music', 'Pictures', 'Videos']
+        xdg_user_dirs = utils.get_common_xdg_directories()
 
         for user_dir in xdg_user_dirs:
             xdg_user_dir_entry = (

=== modified file 'python/libertine/utils.py'
--- python/libertine/utils.py	2016-04-06 19:14:10 +0000
+++ python/libertine/utils.py	2016-05-20 14:44:34 +0000
@@ -100,12 +100,29 @@
     return dpkg.stdout.read().strip()
 
 
+def get_common_xdg_directories():
+    return ['Documents', 'Music', 'Pictures', 'Videos', 'Downloads']
+
+
 def create_libertine_user_data_dir(container_id):
     user_data = get_libertine_container_userdata_dir_path(container_id)
 
     if not os.path.exists(user_data):
         os.makedirs(user_data)
 
+    config_path = os.path.join(user_data, ".config", "dconf")
+
+    if not os.path.exists(config_path):
+        os.makedirs(config_path)
+
+    xdg_user_dirs = get_common_xdg_directories()
+
+    for xdg_dir in xdg_user_dirs:
+        xdg_path = os.path.join(user_data, xdg_dir)
+
+        if not os.path.exists(xdg_path):
+            os.makedirs(xdg_path)
+
 
 def get_libertine_lxc_socket():
     return '\0libertine_lxc_socket'