lp://staging/~jamesodhunt/upstart/bug-1269731
- Get this branch:
- bzr branch lp://staging/~jamesodhunt/upstart/bug-1269731
Branch merges
- Colin Watson (community): Approve
-
Diff: 295 lines (+149/-18)7 files modifiedChangeLog (+23/-0)
init/conf.c (+16/-2)
init/job_class.c (+3/-0)
init/tests/test_conf.c (+77/-12)
scripts/pyupstart.py (+3/-2)
scripts/tests/test_pyupstart_session_init.py (+15/-2)
scripts/tests/test_pyupstart_system_init.py (+12/-0)
Branch information
Recent revisions
- 1592. By James Hunt
-
* scripts/
pyupstart. py:
- JobInstance:destroy( ): Whitespace.
- SessionInit::reexec( ): Add a log message.
* scripts/tests/test_ pyupstart_ session_ init.py:
- TestSessionUpstart: Add pid to ps output.
- TestSessionInitReExec: :test_session_ init_reexec( ):
- Create an invalid job to ensure re-exec can handle it.
- Use 'with' for handling re-exec exception.
* scripts/tests/test_ pyupstart_ system_ init.py:
- TestSystemInitReExec:: test_pid1_ reexec( ):
- Create an invalid job to ensure re-exec can handle it. - 1591. By James Hunt
-
* init/conf.c:
- conf_file_serialise( ): Handle ConfFile's without an
associated JobClass, resulting from an unparseable job configuration
file (LP: #1269731).
- conf_file_deserialise( ): Comments.
* init/job_class.c: job_class_deserialise_ all(): Comments.
* init/tests/test_conf. c: test_source_ reload_ file(): Add new tests:
- "Invalid .conf file does not stop ConfFile being serialised".
- "ConfFile with no JobClass can be deserialised". - 1589. By James Hunt
-
* init/man/init.5: Explain valid syntax for stanzas
accepting a signal (such as 'kill signal'). - 1586. By James Hunt
-
* init/man/init.5: Comma-separate and sort SEE ALSO entries.
* init/man/init.8: Expand SEE ALSO section (debian bug#732128). - 1585. By James Hunt
-
* init/man/init.8:
- Refer to job goals in start/stop/restart commands.
- Explain actual semantics of restart (debian bug#732126). - 1584. By James Hunt
-
* init/man/init.5: Provide additional detail on start/stop on stanzas
with respect to how Upstart deals with complex conditions containing
multiple events (debian bug#732122).
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/upstart