[Merge] lp:~ted/upstart/dbus-configure-event into lp:upstart

[James Hunt]

Review: Needs Fixing

Hi Ted,

This looks good but it needs a tweak to retain backwards-compatibility:

if --bus-name is not specified, we should not try to set it based on the dbus_bus value (ie remove the "if (bus_name == NULL) { ... }" block).

Also, please can you update the doc for the change:

- extra/man/upstart-dbus-bridge.8: needs to explain --bus-name and its impact on dbus-event (adds the extra variable).
- extra/man/dbus-event.7: needs to explain the BUS= variable (only present if bridge started with --bus-name option).

-- 
https://code.launchpad.net/~ted/upstart/dbus-configure-event/+merge/172381
Your team Upstart Reviewers is subscribed to branch lp:upstart.