Merge lp:~ted/upstart/obj-path into lp:upstart

[Ted Gould]

Change dbus object path from PATH to OBJPATH

With dbus events one of the environment variables is PATH. Which makes sense as it is the path to the object emitting the signal. But, unfortunately it overrides the perhaps more common use of PATH, to say where to find binaries. This makes it very hard to have scripts in a job that is listening on dbus events. I'm suggesting we change it to OBJPATH. While I realize this is an interface change, I think that it might effect few enough people, and all of them will like it, that it would be worth it.

[Steve Langasek (vorlon)]

Obviously correct that we should not be overriding the special variable name "PATH" with something here. This breaks compatibility, but the current behavior is sufficiently wrong that I don't think we need to worry about preserving compatibility.

review: Approve

=== modified file 'extra/man/dbus-event.7'
--- extra/man/dbus-event.7	2013-07-24 09:22:25 +0000
+++ extra/man/dbus-event.7	2013-08-30 19:37:14 +0000
@@ -8,7 +8,7 @@
 .BI [ "" BUS\fR= BUS_NAME ]
 .BI SIGNAL\fR= SIGNAL
 .BI INTERFACE\fR= INTERFACE
-.BI PATH\fR= PATH
+.BI OBJPATH\fR= PATH
 .BI SENDER\fR= SENDER
 .BI DESTINATION\fR= DESTINATION
 .BI ARG0\fR= VALUE
@@ -43,7 +43,7 @@
 .\"
 .SH EXAMPLES
 .\"
-.IP "start on dbus SIGNAL=NameAcquired INTERFACE=org.freedesktop.DBus PATH=/org/freedesktop/DBus SENDER=org.freedesktop.DBus ARG0=com.mycorp.foo"
+.IP "start on dbus SIGNAL=NameAcquired INTERFACE=org.freedesktop.DBus OBJPATH=/org/freedesktop/DBus SENDER=org.freedesktop.DBus ARG0=com.mycorp.foo"
 Start job when a particular
 .I NameAcquired
 D-Bus signal is received.
 
=== modified file 'extra/upstart-dbus-bridge.c'
--- extra/upstart-dbus-bridge.c	2013-07-24 09:40:15 +0000
+++ extra/upstart-dbus-bridge.c	2013-08-30 19:37:14 +0000
@@ -513,7 +513,7 @@
 
 	if (path) {
 		nih_local char *var = NULL;
-		var = NIH_MUST (nih_sprintf (NULL, "PATH=%s", path));
+		var = NIH_MUST (nih_sprintf (NULL, "OBJPATH=%s", path));
 		NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
 	}