Merge lp:~townsend/libertine/fix-missing-config-dir into lp:libertine

Proposed by Christopher Townsend
Status: Merged
Approved by: Christopher Townsend
Approved revision: 252
Merged at revision: 252
Proposed branch: lp:~townsend/libertine/fix-missing-config-dir
Merge into: lp:libertine
Diff against target: 18 lines (+7/-1)
1 file modified
python/libertine/utils.py (+7/-1)
To merge this branch: bzr merge lp:~townsend/libertine/fix-missing-config-dir
Reviewer Review Type Date Requested Status
Libertine CI Bot continuous-integration Approve
Stephen M. Webb (community) Approve
Review via email: mp+298225@code.launchpad.net

Commit message

Make sure the directory where ContainersConfig.json lives exists before trying to write out the file.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) :
review: Approve
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:252
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/6/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/86
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/55
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/55
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/55
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/55
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/72/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/89
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/74
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/74
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/67
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/67/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/67
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/67/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/67
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/67/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/67
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/67/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/6/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'python/libertine/utils.py'
2--- python/libertine/utils.py 2016-06-15 16:17:54 +0000
3+++ python/libertine/utils.py 2016-06-23 13:30:24 +0000
4@@ -63,7 +63,13 @@
5 def get_libertine_database_dir_path():
6 xdg_data_home = os.getenv('XDG_DATA_HOME',
7 os.path.join(os.getenv('HOME'), '.local', 'share'))
8- return os.path.join(xdg_data_home, 'libertine')
9+
10+ libertine_database_dir = os.path.join(xdg_data_home, 'libertine')
11+
12+ if not os.path.exists(libertine_database_dir):
13+ os.makedirs(libertine_database_dir)
14+
15+ return libertine_database_dir
16
17
18 def get_libertine_database_file_path():

Subscribers

People subscribed via source and target branches