Merge lp:~xnox/upstart/empty-session into lp:upstart

Proposed by Dimitri John Ledkov on 2014-04-17
Status: Merged
Merged at revision: 1616
Proposed branch: lp:~xnox/upstart/empty-session
Merge into: lp:upstart
Diff against target: 11 lines (+1/-1)
1 file modified
util/initctl.c (+1/-1)
To merge this branch: bzr merge lp:~xnox/upstart/empty-session
Reviewer Review Type Date Requested Status
James Hunt 2014-04-17 Approve on 2014-04-17
Review via email: mp+216338@code.launchpad.net
To post a comment you must log in.
James Hunt (jamesodhunt) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'util/initctl.c'
2--- util/initctl.c 2014-04-09 12:58:58 +0000
3+++ util/initctl.c 2014-04-17 15:10:32 +0000
4@@ -333,7 +333,7 @@
5
6 user_addr = getenv ("UPSTART_SESSION");
7
8- if (user_addr && dbus_bus_type < 0) {
9+ if (user_addr && user_addr[0] && dbus_bus_type < 0) {
10 user_mode = TRUE;
11 }
12

Subscribers

People subscribed via source and target branches