upstart

Merge lp:~jamesodhunt/upstart/bug-1122510 into lp:upstart

Proposed by James Hunt on 2013-03-04

Status:	Superseded
Proposed branch:	lp:~jamesodhunt/upstart/bug-1122510
Merge into:	lp:upstart
Diff against target:	27 lines (+6/-1) 2 files modified ChangeLog (+5/-0) configure.ac (+1/-1)
To merge this branch:	bzr merge lp:~jamesodhunt/upstart/bug-1122510
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Upstart Reviewers		2013-03-04	Pending
Review via email: mp+151462@code.launchpad.net

This proposal has been superseded by a proposal from 2013-03-04.

* configure.ac: Only add sbin to path if exec_prefix specified
(LP: #1122510).

1444. By James Hunt on 2013-03-04: * configure.ac: Only add sbin to path if exec_prefix specified
(LP: #1122510).

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'ChangeLog'
2	--- ChangeLog 2013-03-04 09:55:23 +0000
3	+++ ChangeLog 2013-03-04 11:14:23 +0000
4	@@ -1,5 +1,10 @@
5	2013-03-04 James Hunt <james.hunt@ubuntu.com>
6
7	+ * configure.ac: Only add sbin to path if exec_prefix specified
8	+ (LP: #1122510).
9	+
10	+2013-03-04 James Hunt <james.hunt@ubuntu.com>
11	+
12	* init/session.c: session_from_dbus(): Fixed off-by-one
13	readlink error.
14
15
16	=== modified file 'configure.ac'
17	--- configure.ac 2012-12-07 21:39:17 +0000
18	+++ configure.ac 2013-03-04 11:14:23 +0000
19	@@ -81,7 +81,7 @@
20	AC_MSG_CHECKING([whether to include sbindir in PATH])
21	eval upstart_sbindir=\"$sbindir\"
22	case $upstart_sbindir in
23	- /sbin\|//sbin\|/usr/sbin\|/usr/local/sbin)
24	+ /sbin\|NONE/sbin\|//sbin\|/usr/sbin\|/usr/local/sbin)
25	AC_MSG_RESULT([no])
26	;;
27	*)