Created by James Hunt on 2013-06-24 and last modified on 2013-06-24
Get this branch:
bzr branch lp:~jamesodhunt/upstart/allow-multiple-cmdline-confdirs.make-dist-merge-issue
Only James Hunt can upload to this branch. If you are James Hunt please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

James Hunt

Recent revisions

1475. By James Hunt on 2013-06-24

temporary (broken) merge of lp:upstart.

1474. By James Hunt on 2013-05-30

* init/Makefile.am: Added test_main.
* init/tests/test_main.c: New test.
* init/tests/test_job_process.c: strcmp_compar() moved to test_util.c.
* util/tests/test_initctl.c: strcmp_compar() removed.
* init/xdg.c: Disable loading of jobs from SYSTEM_USERCONFDIR if
  UPSTART_NO_SYSTEM_USERCONFDIR envvar set (required for testing).
* test/test_util.c: Added strcmp_compar() and get_session_file().
* util/tests/test_initctl.c: Use get_session_file().

1473. By James Hunt on 2013-05-30

* Makefile.am: Added 'test'.
* configure.ac: Added 'test/Makefile'.
* init/Makefile.am: Depend on test_util archive rather than source
* init/state.c: Added missing config.h include.
* util/Makefile.am: Depend on test_util archive rather than source
* util/tests/test_initctl.c: Moved common utility code to
  test/test_util.c and replaced INITCTL_BINARY by get_initctl_binary().
* test/test_util.[ch]: New location for init/tests/test_util.[ch] to
  allow all tests access to common functionality.

1472. By James Hunt on 2013-04-02

* init/main.c:
  - main(): Allow Session Init to accept multiple --confdir values,
    which replace all built-in values (behaviour required for testing).
  - handle_confdir(): Operate on conf_dirs array rather than single
    conf_dir value.
  - conf_dir_setter(): Command-line setter function to add configuration
    file directories to conf_dirs array.
* init/man/init.8: Update on --confdir behaviour.

1471. By James Hunt on 2013-03-28

* init/job_process.[ch]: Remove unused

1470. By James Hunt on 2013-03-28

* extra/upstart-event-bridge.c: main():
  - Handle daemon pidfile as the upstart-event-bridge does.
  - Write to stdout, not syslog.

1469. By James Hunt on 2013-03-28

* scripts/upstart-monitor.py: on_button_press_event(): Handle path_info
  being None (LP: #1161098).

1468. By James Hunt on 2013-03-25

* init/man/init.5: Correct section number.

1467. By James Hunt on 2013-03-25

* extra/man/socket-event.7: Correct section number.

1466. By James Hunt on 2013-03-22

* scripts/Makefile.am: Added missing entry for man/upstart-monitor.8.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.