Merge lp:~mterry/unity8-desktop-session/accountsservice into lp:unity8-desktop-session

Proposed by Michael Terry on 2016-11-03
Status: Merged
Approved by: Christopher Townsend on 2016-11-08
Approved revision: 106
Merged at revision: 109
Proposed branch: lp:~mterry/unity8-desktop-session/accountsservice
Merge into: lp:unity8-desktop-session
Diff against target: 31 lines (+27/-0)
1 file modified
debian/unity8-session-snap.links (+27/-0)
To merge this branch: bzr merge lp:~mterry/unity8-desktop-session/accountsservice
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve on 2016-11-08
Christopher Townsend 2016-11-03 Approve on 2016-11-08
Review via email: mp+310005@code.launchpad.net

Commit Message

Point the system AccountsService daemon at our registered custom properties.

Description of the Change

Add links so that the system AccountsService daemon knows about the custom properties that unity8 wants to register (but those files normally live in the snap, which the system AS daemon can't find).

So we link to it from our glue package. In an all-snaps world, we'll need to add a new interface hook for a new AS system snap. We'll figure that out later, but this is a decent fix for the classic desktop.

I've named the files so that they won't conflict if you have unity8 packages separately installed. The content of the files may conflict (like if the snap adds a new property and the debs don't) -- I'm not sure what would happen in that case. But we eventually plan for these to conflict anyway, so I don't think that's a problem.

To post a comment you must log in.
Christopher Townsend (townsend) wrote :

I'm also concerned about the interaction between the snap and deb versions conflicting, but until we have a proper AccountServices snap w/ an interface, this is the best we can do.

I'll approve with my caveat mentioned:)

review: Approve
Stephen M. Webb (bregma) wrote :

Agree with ChrisTownsend's comment.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/unity8-session-snap.links'
2--- debian/unity8-session-snap.links 1970-01-01 00:00:00 +0000
3+++ debian/unity8-session-snap.links 2016-11-03 20:50:53 +0000
4@@ -0,0 +1,27 @@
5+/snap/unity8-session/current/usr/share/accountsservice/interfaces/com.canonical.indicator.sound.AccountsService.xml /usr/share/dbus-1/interfaces/unity8-session-snap-com.canonical.indicator.sound.AccountsService.xml
6+/usr/share/dbus-1/interfaces/unity8-session-snap-com.canonical.indicator.sound.AccountsService.xml /usr/share/accountsservice/interfaces/unity8-session-snap-com.canonical.indicator.sound.AccountsService.xml
7+
8+/snap/unity8-session/current/usr/share/accountsservice/interfaces/com.canonical.TelephonyServiceApprover.xml /usr/share/dbus-1/interfaces/unity8-session-snap-com.canonical.TelephonyServiceApprover.xml
9+/usr/share/dbus-1/interfaces/unity8-session-snap-com.canonical.TelephonyServiceApprover.xml /usr/share/accountsservice/interfaces/unity8-session-snap-com.canonical.TelephonyServiceApprover.xml
10+
11+/snap/unity8-session/current/usr/share/accountsservice/interfaces/com.canonical.unity.AccountsService.xml /usr/share/dbus-1/interfaces/unity8-session-snap-com.canonical.unity.AccountsService.xml
12+/usr/share/dbus-1/interfaces/unity8-session-snap-com.canonical.unity.AccountsService.xml /usr/share/accountsservice/interfaces/unity8-session-snap-com.canonical.unity.AccountsService.xml
13+
14+/snap/unity8-session/current/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Input.xml /usr/share/dbus-1/interfaces/unity8-session-snap-com.ubuntu.AccountsService.Input.xml
15+/usr/share/dbus-1/interfaces/unity8-session-snap-com.ubuntu.AccountsService.Input.xml /usr/share/accountsservice/interfaces/unity8-session-snap-com.ubuntu.AccountsService.Input.xml
16+
17+/snap/unity8-session/current/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.SecurityPrivacy.xml /usr/share/dbus-1/interfaces/unity8-session-snap-com.ubuntu.AccountsService.SecurityPrivacy.xml
18+/usr/share/dbus-1/interfaces/unity8-session-snap-com.ubuntu.AccountsService.SecurityPrivacy.xml /usr/share/accountsservice/interfaces/unity8-session-snap-com.ubuntu.AccountsService.SecurityPrivacy.xml
19+
20+/snap/unity8-session/current/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml /usr/share/dbus-1/interfaces/unity8-session-snap-com.ubuntu.AccountsService.Sound.xml
21+/usr/share/dbus-1/interfaces/unity8-session-snap-com.ubuntu.AccountsService.Sound.xml /usr/share/accountsservice/interfaces/unity8-session-snap-com.ubuntu.AccountsService.Sound.xml
22+
23+/snap/unity8-session/current/usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.Phone.xml /usr/share/dbus-1/interfaces/unity8-session-snap-com.ubuntu.touch.AccountsService.Phone.xml
24+/usr/share/dbus-1/interfaces/unity8-session-snap-com.ubuntu.touch.AccountsService.Phone.xml /usr/share/accountsservice/interfaces/unity8-session-snap-com.ubuntu.touch.AccountsService.Phone.xml
25+
26+/snap/unity8-session/current/usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.SecurityPrivacy.xml /usr/share/dbus-1/interfaces/unity8-session-snap-com.ubuntu.touch.AccountsService.SecurityPrivacy.xml
27+/usr/share/dbus-1/interfaces/unity8-session-snap-com.ubuntu.touch.AccountsService.SecurityPrivacy.xml /usr/share/accountsservice/interfaces/unity8-session-snap-com.ubuntu.touch.AccountsService.SecurityPrivacy.xml
28+
29+/snap/unity8-session/current/usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.Sound.xml /usr/share/dbus-1/interfaces/unity8-session-snap-com.ubuntu.touch.AccountsService.Sound.xml
30+/usr/share/dbus-1/interfaces/unity8-session-snap-com.ubuntu.touch.AccountsService.Sound.xml /usr/share/accountsservice/interfaces/unity8-session-snap-com.ubuntu.touch.AccountsService.Sound.xml
31+

Subscribers

People subscribed via source and target branches