Code review comment for lp:~darkxst/unity-settings-daemon/lp1224217

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

On 13 March 2014 22:58, Robert Ancell <email address hidden> wrote:
> You have been requested to review the proposed merge of lp:~darkxst/unity-settings-daemon/lp1224217 into lp:unity-settings-daemon.
>
> For more details, see:
> https://code.launchpad.net/~darkxst/unity-settings-daemon/lp1224217/+merge/210913
>
> see also gnome-session and g-s-d patches
>
> --
> https://code.launchpad.net/~darkxst/unity-settings-daemon/lp1224217/+merge/210913
> You are requested to review the proposed merge of lp:~darkxst/unity-settings-daemon/lp1224217 into lp:unity-settings-daemon.
>
> === modified file 'debian/changelog'
> --- debian/changelog 2014-03-10 17:25:56 +0000
> +++ debian/changelog 2014-03-13 21:25:21 +0000
> @@ -1,3 +1,11 @@
> +unity-settings-daemon (14.04.0+14.04.20140310-0ubuntu2) UNRELEASED; urgency=medium
> +
> + * unity-settings-demon.user-session.upstart: Use XDG_CURRENT_DESKTOP
> + as the instance specifier for gnome-session upstart jobs, since
> + other sessions apart from ubuntu will need to use u-s-d (LP: #1224217)
> +
> + -- Tim Lunn <email address hidden> Wed, 12 Mar 2014 16:45:51 +1100
> +
> unity-settings-daemon (14.04.0+14.04.20140310-0ubuntu1) trusty; urgency=low
>
> [ David Henningsson ]
>
> === modified file 'debian/unity-settings-daemon.user-session.upstart'
> --- debian/unity-settings-daemon.user-session.upstart 2014-02-07 14:57:09 +0000
> +++ debian/unity-settings-daemon.user-session.upstart 2014-03-13 21:25:21 +0000
> @@ -1,7 +1,7 @@
> description "The Unity Settings Daemon"
> author "Dimitri John Ledkov <email address hidden>"
>
> -start on started dbus and starting gnome-session INSTANCE=ubuntu
> +start on started dbus and starting gnome-session INSTANCE!=GNOME
> stop on stopping gnome-session
>
> respawn
>
>

Hm, the change-log does not match the contents of the change.

When this was designed the assumption was that _everything will use
gnome-settings-daemon_ but the unity7 session.

If this is not the case, we need to redesign this and in the unity-*
upstart jobs have a list of environments to start on.
Or reverse in gnome-* upstart jobs have a list of environments to start on.

--
Regards,

Dimitri.

« Back to merge proposal