lp:~jamesodhunt/upstart/bug-1324096

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1632

Dimitri John Ledkov: Approve on 2014-06-05

Diff: 1394 lines (+986/-145) (has conflicts)

7 files modified

ChangeLog (+37/-0)
dbus/com.ubuntu.Upstart.xml (+13/-0)
init/control.c (+188/-105)
init/control.h (+13/-0)
util/initctl.c (+8/-14)
util/man/initctl.8 (+8/-7)
util/tests/test_initctl.c (+719/-19)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1324096: dbus call needed to set multiple environment variables in a single pass

High

Fix Released

Link a bug report

Related blueprints

1625. By James Hunt on 2014-06-05

* Formatting.

1624. By James Hunt on 2014-06-05

* Merge of lp:~xnox/upstart/bug-1324096.

Merged branch lp:~xnox/upstart/bug-1324096

1623. By James Hunt on 2014-06-04

* dbus/com.ubuntu.Upstart.xml: Renamed SetEnvMulti to SetEnvList and
  UnsetEnvMulti to UnsetEnvList for clarity.
* init/control.c:
  - control_set_env_list(): Renamed from control_set_env_multi().
  - control_unset_env_list(): Renamed from control_unset_env_multi().
  - control_unset_env(): Actually make it call control_unset_env_list().
* util/initctl.c: Updated to call renamed functions.

1622. By James Hunt on 2014-06-02

* dbus/com.ubuntu.Upstart.xml: Added 'SetEnvMulti' and 'UnsetEnvMulti'
  methods to allow multiple job environment variables to be set/unset
  simultaneously (LP: #1324096).
* init/control.c:
  - control_set_env_multi(): Implementation for 'SetEnvMulti'.
  - control_set_env(): Retained 'SetEnv' implementation that now calls
    control_set_env_multi().
  - control_unset_env_multi(): Implementation for 'UnSetEnvMulti'.
  - control_unset_env(): Retained 'UnSetEnv' implementation that now calls
    control_unset_env_multi().
* util/initctl.c:
  - set_env_action(): Updated to call set_env_multi_sync().
  - unset_env_action(): Updated to call unset_env_multi_sync().
* util/man/initctl.8: Updated to document ability for 'set-env' and
  'unset-env' to set and unset multiple variables simultaneously.
* util/tests/test_initctl.c: Added new tests:
  - "multiple set-env in 'name=value' form"
  - "multiple set-env in 'name=' form"
  - "multiple set-env in 'name' form"
  - "set-env for multiple already set variables"
  - "set-env with multiple variables, some already set"
  - "set-env with multiple variables in different forms"
  - "set-env --retain with multiple variables, some already set"

1621. By James Hunt on 2014-05-15

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

1620. By James Hunt on 2014-05-08

* Merge of lp:~xnox/upstart/do-not-launch-session-dbus.

1619. By James Hunt on 2014-05-08

* Merge of lp:~jamesodhunt/upstart/fix-deprecated-json-calls.

1618. By James Hunt on 2014-04-24

* init/man/init.5: Further clarification of 'respawn limit'.

1617. By James Hunt on 2014-04-24

* init/man.5:
  - Clarify default behaviour of 'respawn' stanza.
  - Add missing 'respawn limit unlimited' details.

1616. By James Hunt on 2014-04-17

* Merge of lp:~xnox/upstart/empty-session.