[26468] in Source-Commits
Re: /svn/athena r25575 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Wed Jun 13 01:11:02 2012
Date: Wed, 13 Jun 2012 01:10:59 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201206052100.q55L0rja028609@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1206130109440.18441@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
On Tue, 5 Jun 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-06-05 17:00:53 -0400 (Tue, 05 Jun 2012)
> New Revision: 25575
>
> Modified:
> trunk/debathena/config/reactivate/debian/changelog
> trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper
> Log:
> In reactivate:
> * dbus-daemon-launch-helper moved in precise
>
>
> Modified: trunk/debathena/config/reactivate/debian/changelog
> ===================================================================
> --- trunk/debathena/config/reactivate/debian/changelog 2012-06-05 20:39:27 UTC (rev 25574)
> +++ trunk/debathena/config/reactivate/debian/changelog 2012-06-05 21:00:53 UTC (rev 25575)
> @@ -1,3 +1,9 @@
> +debathena-reactivate (2.0.34) unstable; urgency=low
> +
> + * dbus-daemon-launch-helper moved in precise
> +
> + -- Jonathan Reed <jdreed@mit.edu> Tue, 05 Jun 2012 17:00:48 -0400
> +
> debathena-reactivate (2.0.33) unstable; urgency=low
>
> * Actually install the diverted lightdm-session.debathena file
>
> Modified: trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper
> ===================================================================
> --- trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper 2012-06-05 20:39:27 UTC (rev 25574)
> +++ trunk/debathena/config/reactivate/debian/dbus-daemon-launch-helper 2012-06-05 21:00:53 UTC (rev 25575)
> @@ -4,8 +4,12 @@
> session=$(schroot -l --all-sessions)
> fi
>
> +HELPER=/lib/dbus-1.0/dbus-daemon-launch-helper
> +[ -x "$HELPER" ] || HELPER="/usr${HELPER}"
> +[ -x "$HELPER" ] || logger -t "reactivate" "Can't execute $HELPER"
Trying to run the empty string isn't going to work very well, so we might
as well just bail out, here.
But, this seems to be a strict improvement, so ACK.
-Ben
> +
> if [ -n "$session" ] && [ "$(echo "$session" | wc -l)" -eq 1 ]; then
> - exec schroot -r -c "$session" /lib/dbus-1.0/dbus-daemon-launch-helper "$@"
> + exec schroot -r -c "$session" "$HELPER" "$@"
> else
> - exec /lib/dbus-1.0/dbus-daemon-launch-helper "$@"
> + exec "$HELPER" "$@"
> fi
>
>
