GNOME Bugzilla – Bug 681449
Cleanup the behavior of --replace
Last modified: 2012-08-11 05:22:28 UTC
* Try to use the control directory in the environment if present so that --replace can be sure to work with ssh and gpg agents. * Quit all daemons in session when --replace * Quiet things down when running with --replace, less complaining.
Created attachment 220670 [details] [review] daemon: When --replace quit all running daemons * When using --replace we assume that we're supposed to replace all running daemons in the session, rather than just the first we discovered.
Created attachment 220671 [details] [review] daemon: Be quiet while replacing another daemon * When doing --replace don't complain that the other daemon cannot be reached. It may have exited but we still want to use the environment it setup.
Created attachment 220672 [details] [review] daemon: If control directory in environment use when replacing * When replacing another daemon always prefer the control directory discovered through the environment. This way ssh and gpg work with a --replace'd gnome-keyring-daemon. * Previously we would use the last control directory discovered which meant that if gnome-keyring-daemon had crashed, and had later been restarted via dbus, then the control directory for the last daemon was used, rather than the one in the env.
Created attachment 220673 [details] [review] daemon: When --replace quit all running daemons * When using --replace we assume that we're supposed to replace all running daemons in the session, rather than just the first we discovered.
Attachment 220671 [details] pushed as 5445981 - daemon: Be quiet while replacing another daemon Attachment 220672 [details] pushed as 1cf271c - daemon: If control directory in environment use when replacing Attachment 220673 [details] pushed as 6da2939 - daemon: When --replace quit all running daemons