Created by James Hunt on 2013-10-18 and last modified on 2013-10-22
Get this branch:
bzr branch lp:~jamesodhunt/upstart/bugs-1235649+1203595
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

1545. By James Hunt on 2013-10-22

* init/control.c: control_bus_open(): Don't call nih_dbus_bus() if
  DBUS_SESSION_BUS_ADDRESS is not set to avoid D-bus auto-launching a
* init/environ.c: Comments.
* init/job_class.c:
  - job_class_environment_init(): Superior check on whether job_environ
    is not empty.
  - job_class_environment_reset(): Only reset job_environ if not NULL
  - job_class_environment_set(): Set variable in Upstarts environment
    too (required to allow Upstart to be aware of the D-Bus session bus
    address when the dbus-daemon is available).
  - job_class_environment_unset(): Unset variable from Upstarts
    environment, but only if it is not a default variable.
* init/job_process.c: Formatting.
* init/test_control.c: Updated strings used by tests which check error
  messages to include 'D-Bus'.
* init/test_environ.c:
  - test_add(): New test:
    - "using bare word with no corresponding variable set in environment"
  - test_remove(): New function ("the missing test") containing 8 new tests:
    - "remove name=value pair with empty table"
    - "remove bare name with empty table"
    - "remove name=value from table of size 1"
    - "remove bare name from table of size 1"
    - "remove first name=value entry from table of size 2"
    - "remove first bare name entry from table of size 2"
    - "remove last name=value entry from table of size 2"
    - "remove last bare name entry from table of size 2"
* test/test_util_common.c:
  - Formatting.
  - get_initctl(): Added environment checks.
* util/initctl.c:
  - Formatting.
  - Removed testing comment from option text for '--session'.
* util/man/initctl.8: Removed testing comment for '--session'.
* util/tests/test_initctl.c:
  - test_session_init(): New test that checks the Session Init now
    connects to the D-Bus session bus.

1544. By James Hunt on 2013-10-18

* Connect to the D-Bus session bus as well as using a private socket
  when running as a Session Init (LP: #1203595, #1235649).

1543. By Scott James Remnant (Canonical) on 2013-10-03

Do not respawn jobs, that are being stopped and running pre-stop already.

1540. By James Hunt on 2013-10-04

* Merge of lp:~xnox/upstart/fix-1234841.

1538. By James Hunt on 2013-10-02

* test/test_util_common.c:
  - set_upstart_session(): Call get_initctl_binary() rather than using
    define value.
  - get_initctl(): As above.
  - get_initctl_binary(): Check that file exists for parity with

1537. By James Hunt on 2013-10-01

* extra/upstart-file-bridge.c:
  - upstart_job_added(): Make quieter in manner consistent with other
    bridges (only display output in debug mode).
  - upstart_job_removed(): As above.

1536. By James Hunt on 2013-10-01

* init/job_process.c:job_process_jobs_running(): Removed unused

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.