Libertine

Merge lp:~bregma/libertine/libertine-demo-dont-remove-config into lp:libertine

  1. libertine-demo-dont-remove-config
  2. Merge into devel
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 177
Merged at revision: 177
Proposed branch: lp:~bregma/libertine/libertine-demo-dont-remove-config
Merge into: lp:libertine
Diff against target: 14 lines (+3/-1)
1 file modified
data/puritine-click.conf (+3/-1)
To merge this branch: bzr merge lp:~bregma/libertine/libertine-demo-dont-remove-config
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
Libertine CI Bot continuous-integration Approve
Review via email: mp+287778@code.launchpad.net

Commit message

libertine-demo: do not remove the ContainersConfig file if there are still containers

Description of the change

Libertine-demo: do not remove the ContainersConfig file if there are still containers.

If the Puritine click is not installed oir has been removed, the Upstart job shipped with the libertine-deom package will remove the ContainersConfig.json file even if there are other containers on the system. That's a little mean.

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

PASSED: Continuous integration, rev:177
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/129/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/132
    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/91
    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/91
    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/91
    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/91
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1027/console

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

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Good catch, and yeah, it is a bit evil. I assumed if you had libertine-demo installed, you were using Puritine, but that is a bad assumption.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/puritine-click.conf'
2--- data/puritine-click.conf 2016-01-19 16:51:14 +0000
3+++ data/puritine-click.conf 2016-03-02 13:26:49 +0000
4@@ -26,7 +26,9 @@
5 fi
6 else
7 rm -rf $HOME/.cache/libertine-container/$CONTAINER_NAME
8- rm -rf $HOME/.local/share/libertine
9+ if [ $(libertine-container-manager list | grep -v ${CONTAINER_NAME} | wc -l) -eq 0 ]; then
10+ rm -rf $HOME/.local/share/libertine
11+ fi
12 rm -rf $HOME/.local/share/libertine-container/user-data/$CONTAINER_NAME/.config/
13 fi
14 end script

Subscribers

People subscribed via source and target branches