[Merge] ~muktupavels/ubuntu/+source/gnome-session:upstart into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master

[Iain Lane]

Review: Needs Fixing

Thanks, seems like a good idea, but please look at my comment.

Diff comments:

> diff --git a/debian/data/gnome-session.service b/debian/data/gnome-session.service
> index 5582a14..207cc72 100644
> --- a/debian/data/gnome-session.service
> +++ b/debian/data/gnome-session.service
> @@ -8,4 +8,4 @@ ExecStart=/bin/sh -exc '[ "$DESKTOP_SESSION" != "gnome-classic" ] || export GNOM
>      [ "$DESKTOP_SESSION" = gnome-flashback-metacity ] && \
>          exec gnome-session --session=$DESKTOP_SESSION --disable-acceleration-check || \
>          exec gnome-session --session=$DESKTOP_SESSION'
> -ExecStopPost=-/bin/sh -xc '[ "${XDG_SESSION_PATH}" = "${GNOME_SESSION_XDG_SESSION_PATH}" ] && /usr/bin/dbus-send --type=method_call --address=${UPSTART_SESSION} /com/ubuntu/Upstart com.ubuntu.Upstart0_6.EndSession'
> +ExecStopPost=-/bin/sh -xc '[ "${XDG_SESSION_PATH}" = "${GNOME_SESSION_XDG_SESSION_PATH}" ] && [ ! -z ${UPSTART_SESSION} ] && /usr/bin/dbus-send --type=method_call --address=${UPSTART_SESSION} /com/ubuntu/Upstart com.ubuntu.Upstart0_6.EndSession'

This could just be [ "${UPSTART_SESSION}" ], I think? Using "-n", and then the fact that "-n" is the default. Also please quote the variable, for safety.



-- 
https://code.launchpad.net/~muktupavels/ubuntu/+source/gnome-session/+git/gnome-session/+merge/362976
Your team Ubuntu Desktop is requested to review the proposed merge of ~muktupavels/ubuntu/+source/gnome-session:upstart into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master.