location-service

Merge lp:~mandel/location-service/simple-trust-store-fix into lp:location-service/trunk

  1. simple-trust-store-fix
  2. Merge into trunk
Proposed by Manuel de la Peña on 2015-05-28
Status: Merged
Approved by: Michael Frey on 2015-05-29
Approved revision: 196
Merged at revision: 199
Proposed branch: lp:~mandel/location-service/simple-trust-store-fix
Merge into: lp:location-service/trunk
Diff against target: 15 lines (+4/-2)
1 file modified
data/ubuntu-location-service-trust-stored.conf.in (+4/-2)
To merge this branch: bzr merge lp:~mandel/location-service/simple-trust-store-fix
Reviewer Review Type Date Requested Status
Michael Frey (community) Approve on 2015-05-29
Thomas Voß (community) 2015-05-28 Approve on 2015-05-29
PS Jenkins bot continuous-integration Approve on 2015-05-28
Review via email: mp+260497@code.launchpad.net

Commit Message

Ensure that the trust store is started when is needed.

Description of the Change

This branch ensures that the trust store is indeed restarted when the location service dies (crashed or killed). A simple way to test this is to use the location service after the wizard and ensure that the trust promt is there and is the correct one.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Thomas Voß (thomas-voss) wrote :

LGTM.

review: Approve
Michael Frey (mfrey) wrote :

yes looks good.

review: Approve
lp:~mandel/location-service/simple-trust-store-fix updated on 2015-06-01
197. By Manuel de la Peña on 2015-06-01

Remerged with trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/ubuntu-location-service-trust-stored.conf.in'
2--- data/ubuntu-location-service-trust-stored.conf.in 2014-09-19 14:36:51 +0000
3+++ data/ubuntu-location-service-trust-stored.conf.in 2015-06-01 15:11:08 +0000
4@@ -4,8 +4,10 @@
5 # starting; if dbus is available and location-service isn't or vice-versa,
6 # startup will fail but the next event firing will trigger another start
7 start on (started dbus and xsession SESSION=ubuntu-touch) or \
8- :sys:started JOB=ubuntu-location-service
9-stop on desktop-end or :sys:stopping JOB=ubuntu-location-service
10+ dbus BUS=system SIGNAL=NameOwnerChanged INTERFACE=org.freedesktop.DBus OBJPATH=/org/freedesktop/DBus ARG0=com.ubuntu.location.Service ARG2!=""
11+
12+stop on desktop-end or \
13+ dbus BUS=system SIGNAL=NameOwnerChanged INTERFACE=org.freedesktop.DBus OBJPATH=/org/freedesktop/DBus ARG0=com.ubuntu.location.Service ARG2=""
14
15 respawn
16

Subscribers

People subscribed via source and target branches