Merge lp:~stgraber/upstart/upstart-fix-env-test into lp:upstart
Proposed by
Stéphane Graber
Status: | Merged |
---|---|
Merged at revision: | 1438 |
Proposed branch: | lp:~stgraber/upstart/upstart-fix-env-test |
Merge into: | lp:upstart |
Diff against target: |
27 lines (+6/-0) 2 files modified
init/main.c (+3/-0) util/tests/test_initctl.c (+3/-0) |
To merge this branch: | bzr merge lp:~stgraber/upstart/upstart-fix-env-test |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Hunt | Approve | ||
Review via email: mp+150447@code.launchpad.net |
Description of the change
An earlier commit changed --inherit-env into --no-inherit-env, thereby changing
the default behaviour to inheriting the environment by default.
What the change didn't do however was restrict it to user sessions only, which
had the side effect of breaking the tests.
This branch does two things:
1) set no_inherit_env = TRUE when not running under user sessions.
2) pass --no-inherit-env to user session tests.
To post a comment you must log in.
LGTM.