Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/upstart/obj-path/+merge/183259
proposed by: Ted Gould (ted)
review: Approve - Steve Langasek (vorlon)
------------------------------------------------------------
revno: 1527 [merge]
committer: Steve Langasek <[email protected]>
branch nick: upstream
timestamp: Sun 2013-09-01 10:13:04 -0700
message:
Merge lp:~ted/upstart/obj-path
modified:
extra/man/dbus-event.7
extra/upstart-dbus-bridge.c
--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk
Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== 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:34:01 +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:30:33 +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));
}
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
