Merge lp:~lool/ubuntu-location-provider-here/dbus-activation-fix into lp:ubuntu-location-provider-here

[Loïc Minier]

Use org.freedesktop.Accounts.FindUserByName(); this makes sure the user object is properly created when we list properties on it; LP: #1384321.

Use org.freedesktop.Accounts.FindUserByName(); this makes sure the user object is properly created when we list properties on it; LP: #1384321.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:18
http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-utopic-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-location-provider-here-ci/17/rebuild

review: Approve (continuous-integration)

[Manuel de la Peña (mandel)]

review: Needs Fixing

[lp:~lool/ubuntu-location-provider-here/dbus-activation-fix]

19. By Loïc Minier on 2014-10-22

s/pathes/paths/

[Manuel de la Peña (mandel)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-location-provider-here-utopic-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-location-provider-here-ci/18/rebuild

review: Approve (continuous-integration)

=== modified file 'usr/bin/herepositioning-license-accepted'
--- usr/bin/herepositioning-license-accepted	2014-09-17 14:18:33 +0000
+++ usr/bin/herepositioning-license-accepted	2014-10-22 19:29:30 +0000
@@ -33,15 +33,19 @@
 USERNAME="$1"
 USERNAME="${USERNAME:-phablet}"
 
-if ! uid="$(id -u $USERNAME)"; then
-    die "User $USERNAME not found" >&2
+# NB: this triggers DBus activation in case Account Service wasn't running
+if ! user="$(ofa_dbus /org/freedesktop/Accounts \
+                      org.freedesktop.Accounts.FindUserByName \
+                      "string:$USERNAME")"; then
+    die "Couldn't find user $USERNAME in AccountService"
 fi
 
-if ! data="$(dbus_do org.freedesktop.Accounts \
-                     /org/freedesktop/Accounts/User$uid \
-                     org.freedesktop.DBus.Properties.GetAll \
-                     string:com.ubuntu.location.providers.here.AccountsService)"; then
-    die "Couldn't read AccountService properties for uid $uid"
+userpath="$(echo "$user" | dbus_object_paths)"
+
+if ! data="$(ofa_dbus "$userpath" \
+                      org.freedesktop.DBus.Properties.GetAll \
+                      string:com.ubuntu.location.providers.here.AccountsService)"; then
+    die "Couldn't read HERE AccountService properties for user path $userpath"
 fi
 
 if [ "$(get_dbus_prop "$data" "boolean" "LicenseAccepted")" = "true" ]; then

=== modified file 'usr/share/ubuntu-location-provider-here/functions'
--- usr/share/ubuntu-location-provider-here/functions	2014-09-17 14:18:33 +0000
+++ usr/share/ubuntu-location-provider-here/functions	2014-10-22 19:29:30 +0000
@@ -18,7 +18,16 @@
     dbus_do "org.ofono" "$@"
 }
 
-# DBus object pathes of oFono modems, one per line; bails out if oFono isn't
+ofa_dbus() {
+    dbus_do "org.freedesktop.Accounts" "$@"
+}
+
+# stdin: DBus reply, stdout: DBus object paths, one per line
+dbus_object_paths() {
+    sed -n 's/^ *object path "\(.*\)"$/\1/p'
+}
+
+# DBus object paths of oFono modems, one per line; bails out if oFono isn't
 # available
 get_modems() {
     local modems
@@ -26,8 +35,8 @@
     if ! modems="$(ofono_dbus / org.ofono.Manager.GetModems)"; then
         return 1
     fi
-    # convert to /ril_0 etc. object pathes
-    echo "$modems" | sed -n 's/^ *object path "\(.*\)"$/\1/p'
+    # convert to /ril_0 etc. object paths
+    echo "$modems" | dbus_object_paths
 }
 
 # extracts value of a property from a DBus reply; variant is the type