Libertine

Merge lp:~townsend/libertine/fix-libertined-pkill into lp:libertine

  1. fix-libertined-pkill
  2. Merge into devel
Proposed by Christopher Townsend
Status: Merged
Approved by: Larry Price
Approved revision: 430
Merged at revision: 430
Proposed branch: lp:~townsend/libertine/fix-libertined-pkill
Merge into: lp:libertine
Diff against target: 42 lines (+4/-5)
3 files modified
debian/control (+2/-1)
debian/libertined.preinst (+1/-2)
debian/libertined.prerm (+1/-2)
To merge this branch: bzr merge lp:~townsend/libertine/fix-libertined-pkill
Reviewer Review Type Date Requested Status
Larry Price Approve
Libertine CI Bot continuous-integration Approve
Review via email: mp+319084@code.launchpad.net

Commit message

Ignore error status when trying to kill libertined on package upgrade or removal. Also, depend on the procps package.

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

FAILED: Continuous integration, rev:429
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/442/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/822/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/832
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/824
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/824/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/824
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/824/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/824
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/824/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/824/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:429
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/444/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/824
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/678
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/678
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/678
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/678
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/834
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/826
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/826/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/826
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/826/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/826
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/826/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/826
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/826/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
lp:~townsend/libertine/fix-libertined-pkill updated
430. By Christopher Townsend

Add message about shutting down the libertined service.

Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:430
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/445/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/826
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/680
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/680
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/680
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/680
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/836
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/828
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/828/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/828
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/828/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/828
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/828/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/828
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/828/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Larry Price (larryprice) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2017-02-23 21:08:28 +0000
3+++ debian/control 2017-03-06 16:16:08 +0000
4@@ -116,7 +116,8 @@
5 Package: libertined
6 Architecture: any
7 Multi-Arch: same
8-Depends: python3-libertine,
9+Depends: procps,
10+ python3-libertine,
11 python3-apt,
12 python3-dbus,
13 python3-gi,
14
15=== modified file 'debian/libertined.preinst'
16--- debian/libertined.preinst 2017-02-23 21:00:19 +0000
17+++ debian/libertined.preinst 2017-03-06 16:16:08 +0000
18@@ -14,9 +14,8 @@
19 # along with this program. If not, see <http://www.gnu.org/licenses/>.
20 #
21
22-set -e
23-
24 if [ "$1" = "upgrade" ]; then
25+ echo "Shutting down the libertined service..."
26 pkill libertined
27 fi
28
29
30=== modified file 'debian/libertined.prerm'
31--- debian/libertined.prerm 2017-02-23 21:00:19 +0000
32+++ debian/libertined.prerm 2017-03-06 16:16:08 +0000
33@@ -14,9 +14,8 @@
34 # along with this program. If not, see <http://www.gnu.org/licenses/>.
35 #
36
37-set -e
38-
39 if [ "$1" = "remove" ]; then
40+ echo "Shutting down the libertined service..."
41 pkill libertined
42 fi
43

Subscribers

People subscribed via source and target branches