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

Proposed by James Henstridge on 2019-03-19
Status: Merged
Approved by: Zygmunt Krynicki on 2019-03-19
Approved revision: no longer in the source branch.
Merged at revision: 3
Proposed branch: lp:~jamesh/snappy-hub/test-snapd-dbus-service
Merge into: lp:~snappy-dev/snappy-hub/test-snapd-dbus-service
Diff against target: 49 lines (+8/-5)
1 file modified
snapcraft.yaml (+8/-5)
To merge this branch: bzr merge lp:~jamesh/snappy-hub/test-snapd-dbus-service
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) 2019-03-19 Approve on 2019-03-19
Review via email: mp+364742@code.launchpad.net

Commit message

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

Description of the change

This merge proposal removes the "activatable: true" interface attributes and replaces them with an "activates-on:" stanza in the app, as discussed at the last sprint.

To post a comment you must log in.
Zygmunt Krynicki (zyga) wrote :

Looks good and matches discussions.

review: Approve
3. By Zygmunt Krynicki on 2020-04-01

Merge branch from James

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 2018-12-05 12:07:04 +0000
3+++ snapcraft.yaml 2020-04-01 08:52:07 +0000
4@@ -1,17 +1,16 @@
5 name: test-snapd-dbus-service
6-version: 1.0
7+version: '1.0'
8+base: core18
9 summary: Python based example dbus service
10 description: ...
11 slots:
12 dbus-session-slot:
13 interface: dbus
14 bus: session
15- activatable: true
16 name: io.snapcraft.SnapDbusService
17 dbus-system-slot:
18 interface: dbus
19 bus: system
20- activatable: true
21 name: io.snapcraft.SnapDbusService
22 apps:
23 session:
24@@ -20,11 +19,15 @@
25 - network
26 slots:
27 - dbus-session-slot
28+ passthrough:
29+ activates-on:
30+ - dbus-session-slot
31 system:
32 command: bin/test-snapd-dbus-service system
33 passthrough:
34 daemon: dbus
35- bus-name: io.snapcraft.SnapDbusService
36+ activates-on:
37+ - dbus-system-slot
38 plugs:
39 - network
40 slots:
41@@ -32,7 +35,7 @@
42 parts:
43 test-snapd-dbus-service:
44 source: .
45- plugin: python3
46+ plugin: python
47 stage-packages:
48 - python3-dbus
49 - python3-gi

Subscribers

People subscribed via source and target branches