Merge lp:~vorlon/upstart/lp.1235480 into lp:upstart

Proposed by Steve Langasek on 2013-10-04
Status: Merged
Merge reported by: Steve Langasek
Merged at revision: not available
Proposed branch: lp:~vorlon/upstart/lp.1235480
Merge into: lp:upstart
Diff against target: 56 lines (+9/-4)
3 files modified
ChangeLog (+5/-0)
extra/man/upstart-local-bridge.8 (+3/-3)
extra/upstart-local-bridge.c (+1/-1)
To merge this branch: bzr merge lp:~vorlon/upstart/lp.1235480
Reviewer Review Type Date Requested Status
St├ęphane Graber 2013-10-04 Approve on 2013-10-04
Review via email: mp+189434@code.launchpad.net

Description of the change

just as for the dbus bridge, we need the local bridge to not clobber $PATH.

To post a comment you must log in.
lp:~vorlon/upstart/lp.1235480 updated on 2013-10-04
1543. By Steve Langasek on 2013-10-04

Update the manpage to match

St├ęphane Graber (stgraber) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-10-04 12:33:07 +0000
3+++ ChangeLog 2013-10-04 21:46:12 +0000
4@@ -1,3 +1,8 @@
5+2013-01-04 Steve Langasek <steve.langasek@ubuntu.com
6+
7+ * extra/upstart-local-bridge.c: use SOCKET_PATH in our event
8+ environment, instead of clobbering PATH. (LP: #1235480)
9+
10 2013-10-04 James Hunt <james.hunt@ubuntu.com>
11
12 * extra/upstart-local-bridge.c:
13
14=== modified file 'extra/man/upstart-local-bridge.8'
15--- extra/man/upstart-local-bridge.8 2013-07-25 19:46:56 +0000
16+++ extra/man/upstart-local-bridge.8 2013-10-04 21:46:12 +0000
17@@ -70,7 +70,7 @@
18 CLIENT_PID=\fIPID\fP
19 Process ID of connected client.
20 .IP \(bu 4
21-PATH=\fIPATH\fP
22+SOCKET_PATH=\fIPATH\fP
23 .P
24 .\"
25 .SH EXAMPLES
26@@ -81,7 +81,7 @@
27
28 .RS
29 .nf
30-foo SOCKET_TYPE=unix SOCKET_VARIANT=named PATH=/var/foo/bar name=value
31+foo SOCKET_TYPE=unix SOCKET_VARIANT=named SOCKET_PATH=/var/foo/bar name=value
32 .fi
33 .RE
34 .IP "upstart\-local\-bridge \-\-event=bar \-\-path=@/var/foo/bar" 0.4i
35@@ -91,7 +91,7 @@
36
37 .RS
38 .nf
39-bar SOCKET_TYPE=unix SOCKET_VARIANT=abstract PATH=@/var/foo/bar name=value
40+bar SOCKET_TYPE=unix SOCKET_VARIANT=abstract SOCKET_PATH=@/var/foo/bar name=value
41 .fi
42 .RE
43 .\"
44
45=== modified file 'extra/upstart-local-bridge.c'
46--- extra/upstart-local-bridge.c 2013-10-04 11:12:44 +0000
47+++ extra/upstart-local-bridge.c 2013-10-04 21:46:12 +0000
48@@ -824,7 +824,7 @@
49 var = NIH_MUST (nih_sprintf (NULL, "CLIENT_PID=%u", (unsigned int)client->ucred.pid));
50 NIH_MUST (nih_str_array_addp (&env, NULL, NULL, var));
51
52- var = NIH_MUST (nih_sprintf (NULL, "PATH=%s", socket_path));
53+ var = NIH_MUST (nih_sprintf (NULL, "SOCKET_PATH=%s", socket_path));
54 NIH_MUST (nih_str_array_addp (&env, NULL, NULL, var));
55
56 /* Add the name=value pair */

Subscribers

People subscribed via source and target branches