Merge lp:~jamesh/snappy-hub/test-snapd-dbus-service into lp:~snappy-dev/snappy-hub/test-snapd-dbus-service

Proposed by James Henstridge on 2020-05-13
Status: Merged
Merged at revision: 4
Proposed branch: lp:~jamesh/snappy-hub/test-snapd-dbus-service
Merge into: lp:~snappy-dev/snappy-hub/test-snapd-dbus-service
Diff against target: 22 lines (+5/-3)
1 file modified
snapcraft.yaml (+5/-3)
To merge this branch: bzr merge lp:~jamesh/snappy-hub/test-snapd-dbus-service
Reviewer Review Type Date Requested Status
Snappy Developers 2020-05-13 Pending
Review via email: mp+383854@code.launchpad.net

Commit message

Update snap to match jhenstridge/snapd:dbus-activation branch.

Description of the change

This merge proposal changes the "session" app to a "daemon-scope: user" daemon. This is to match the snapd pull request, where activatable D-Bus services now need to be daemons.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snapcraft.yaml'
2--- snapcraft.yaml 2020-04-01 08:51:20 +0000
3+++ snapcraft.yaml 2020-05-13 08:50:51 +0000
4@@ -15,13 +15,15 @@
5 apps:
6 session:
7 command: bin/test-snapd-dbus-service session
8+ passthrough:
9+ daemon: dbus
10+ daemon-scope: user
11+ activates-on:
12+ - dbus-session-slot
13 plugs:
14 - network
15 slots:
16 - dbus-session-slot
17- passthrough:
18- activates-on:
19- - dbus-session-slot
20 system:
21 command: bin/test-snapd-dbus-service system
22 passthrough:

Subscribers

People subscribed via source and target branches