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

Proposed by James Henstridge
Status: Merged
Approved by: Zygmunt Krynicki
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 Approve
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.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Looks good and matches discussions.

review: Approve
3. By Zygmunt Krynicki

Merge branch from James

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'snapcraft.yaml'
--- snapcraft.yaml 2018-12-05 12:07:04 +0000
+++ snapcraft.yaml 2020-04-01 08:52:07 +0000
@@ -1,17 +1,16 @@
1name: test-snapd-dbus-service1name: test-snapd-dbus-service
2version: 1.02version: '1.0'
3base: core18
3summary: Python based example dbus service4summary: Python based example dbus service
4description: ...5description: ...
5slots:6slots:
6 dbus-session-slot:7 dbus-session-slot:
7 interface: dbus8 interface: dbus
8 bus: session9 bus: session
9 activatable: true
10 name: io.snapcraft.SnapDbusService10 name: io.snapcraft.SnapDbusService
11 dbus-system-slot:11 dbus-system-slot:
12 interface: dbus12 interface: dbus
13 bus: system13 bus: system
14 activatable: true
15 name: io.snapcraft.SnapDbusService14 name: io.snapcraft.SnapDbusService
16apps:15apps:
17 session:16 session:
@@ -20,11 +19,15 @@
20 - network19 - network
21 slots:20 slots:
22 - dbus-session-slot21 - dbus-session-slot
22 passthrough:
23 activates-on:
24 - dbus-session-slot
23 system:25 system:
24 command: bin/test-snapd-dbus-service system26 command: bin/test-snapd-dbus-service system
25 passthrough:27 passthrough:
26 daemon: dbus28 daemon: dbus
27 bus-name: io.snapcraft.SnapDbusService29 activates-on:
30 - dbus-system-slot
28 plugs:31 plugs:
29 - network32 - network
30 slots:33 slots:
@@ -32,7 +35,7 @@
32parts:35parts:
33 test-snapd-dbus-service:36 test-snapd-dbus-service:
34 source: .37 source: .
35 plugin: python338 plugin: python
36 stage-packages:39 stage-packages:
37 - python3-dbus40 - python3-dbus
38 - python3-gi41 - python3-gi

Subscribers

People subscribed via source and target branches