Re: [Sugar-devel] Enable gnome-keyring to autostart in sugar-emulator
Yeah, I have expected both sign it, if they worked together. Daniel, in the future, add a Signed-off-by line to your patches. Gonzalo On Thu, Jul 5, 2012 at 3:33 AM, Sascha Silbe wrote: > Gonzalo Odiard writes: > > > Why is > > > > Signed-off-by: Caspar Bothmer > > > > if the patch was done by Daniel? > > Because Caspar changed the patch. See the kernel patch submission guide > [1], section 12) Sign your work: > > >> [...] Rule (b) allows you to adjust the code, but then it is very > >> impolite to change one submitter's code and make him endorse your > >> bugs. To solve this problem, it is recommended that you add a line > >> between the last Signed-off-by header and yours, indicating the > >> nature of your changes. > > > It looks odd in this case because Daniel didn't sign off his own > patch. The kernel maintainers simply wouldn't accept a patch that isn't > signed off by the author, but as even Daniel Drake's and Simon's patches > aren't always signed off, I can't really enforce that rule for other > Sugar contributors. > > Sascha > > [1] https://www.kernel.org/doc/Documentation/SubmittingPatches > -- > http://sascha.silbe.org/ > http://www.infra-silbe.de/ > ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Enable gnome-keyring to autostart in sugar-emulator
Gonzalo Odiard writes: > Why is > > Signed-off-by: Caspar Bothmer > > if the patch was done by Daniel? Because Caspar changed the patch. See the kernel patch submission guide [1], section 12) Sign your work: >> [...] Rule (b) allows you to adjust the code, but then it is very >> impolite to change one submitter's code and make him endorse your >> bugs. To solve this problem, it is recommended that you add a line >> between the last Signed-off-by header and yours, indicating the >> nature of your changes. It looks odd in this case because Daniel didn't sign off his own patch. The kernel maintainers simply wouldn't accept a patch that isn't signed off by the author, but as even Daniel Drake's and Simon's patches aren't always signed off, I can't really enforce that rule for other Sugar contributors. Sascha [1] https://www.kernel.org/doc/Documentation/SubmittingPatches -- http://sascha.silbe.org/ http://www.infra-silbe.de/ pgpMLfigKyJPK.pgp Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Enable gnome-keyring to autostart in sugar-emulator
Why is Signed-off-by: Caspar Bothmer if the patch was done by Daniel? Gonzalo On Wed, Jul 4, 2012 at 5:59 PM, Sascha Silbe wrote: > Daniel Narvaez writes: > > > Thanks. Can you please push the patch with updated log? > > Pushed as f0ee9e9 [1] to master. AFAIK (and the commit message doesn't > state the opposite), it doesn't fix any user-visible issue, so I haven't > pushed to the stable branch (sucrose-0.96). > > Sascha > > [1] > http://git.sugarlabs.org/sugar/mainline/commit/f0ee9e9fae87fe54e8bd59244b012a2aba23131f > -- > http://sascha.silbe.org/ > http://www.infra-silbe.de/ > > ___ > Sugar-devel mailing list > Sugar-devel@lists.sugarlabs.org > http://lists.sugarlabs.org/listinfo/sugar-devel > > ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Enable gnome-keyring to autostart in sugar-emulator
Daniel Narvaez writes: > Thanks. Can you please push the patch with updated log? Pushed as f0ee9e9 [1] to master. AFAIK (and the commit message doesn't state the opposite), it doesn't fix any user-visible issue, so I haven't pushed to the stable branch (sucrose-0.96). Sascha [1] http://git.sugarlabs.org/sugar/mainline/commit/f0ee9e9fae87fe54e8bd59244b012a2aba23131f -- http://sascha.silbe.org/ http://www.infra-silbe.de/ pgpeoVk9lSDIs.pgp Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Enable gnome-keyring to autostart in sugar-emulator
Daniel Narvaez writes: > Thanks. Can you please push the patch with updated log? We will do that today. Thanks again for the patch and for your patience. This change wasn't quite as simple as it looks; it took us some time to understand the root cause of the bug and sorting out the details (we thought we did the first time, but realised later there were some inconsistencies in our theory). I hope we covered enough of that in the commit message while still leaving out those parts that are outside of Sugar's domain (like how gnome-keyring-daemon works internally). If there's any detail that anyone would like to know about, please ask now, while it's fresh in our memories. Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ pgp76WLXpcdvZ.pgp Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Enable gnome-keyring to autostart in sugar-emulator
Thanks. Can you please push the patch with updated log?
On 3 July 2012 13:53, Caspar Bothmer wrote:
> Hello Daniel,
>
> sorry, been busy...
>
> Sascha and me have discussed this issue thoroughly. The diff itself is easy,
> the reasoning behind is not.
>
> So we decided just to tell you how we would write this commit message and
> the diff to reflect the situation. The commit message will become the
> entry in git log. It's not enough to tell in your own words, what the diff
> is doing and giving the place, where this solution is outlined.
> You need to extract the relevant information, what you do and why.
>
> Caspar
>
>
> Subject: Enable gnome-keyring-daemon to start inside the emulated session.
>
> We have the following situation: there is an instance of gnome-keyring-daemon
> running on the machine. But sugar-emulator can't access this instance of
> gnome-keyring-daemon, as it is outside the scope of sugar-emulator and not
> registered with the D-Bus session bus started by sugar-emulator.
> D-Bus tries to start a new instance of gnome-keyring-daemon, which fails due
> to a set of environment variables related to gnome-keyring-daemon. These
> essentially make gnome-keyring-daemon try to initialize the existing instance
> of gnome-keyring-daemon outside the scope of sugar-emulator.
> By removing these environment variables, D-Bus can start a new instance of
> gnome-keyring-daemon and register with the D-Bus session.
>
> See
> https://bugzilla.gnome.org/show_bug.cgi?id=628302
> and
> https://live.gnome.org/GnomeKeyring/RunningDaemon
>
> for more information.
>
> ---
> bin/sugar.in|6 --
> src/jarabe/util/emulator.py |7 +++
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/bin/sugar.in b/bin/sugar.in
> index 12098db..2df0ab8 100644
> --- a/bin/sugar.in
> +++ b/bin/sugar.in
> @@ -62,12 +62,6 @@ export LANGUAGE="${LANGUAGE:-${LANG}}"
> # Set Sugar's telepathy accounts directory
> export MC_ACCOUNT_DIR=$HOME/.sugar/$SUGAR_PROFILE/accounts
>
> -# Workaround until gnome-keyring-daemon lets dbus activate it
> -# https://bugzilla.gnome.org/show_bug.cgi?id=628302
> -if test "$SUGAR_EMULATOR" = "yes" -a "$(type gnome-keyring-daemon)"; then
> -gnome-keyring-daemon --components=secrets &
> -fi
> -
> # Source language settings and debug definitions
> if [ -f ~/.i18n ]; then
> . ~/.i18n
> diff --git a/src/jarabe/util/emulator.py b/src/jarabe/util/emulator.py
> index fda1b59..db34190 100644
> --- a/src/jarabe/util/emulator.py
> +++ b/src/jarabe/util/emulator.py
> @@ -120,6 +120,13 @@ def _start_window_manager():
>
>
> def _setup_env(display, scaling, emulator_pid):
> +# We need to remove the environment related to gnome-keyring-daemon,
> +# so a new instance of gnome-keyring-daemon can be started and
> +# registered properly.
> +for variable in ['GPG_AGENT_INFO', 'SSH_AUTH_SOCK',
> + 'GNOME_KEYRING_CONTROL', 'GNOME_KEYRING_PID']:
> +if variable in os.environ:
> +del os.environ[variable]
> +
> os.environ['SUGAR_EMULATOR'] = 'yes'
> os.environ['GABBLE_LOGFILE'] = os.path.join(
> env.get_profile_path(), 'logs', 'telepathy-gabble.log')
--
Daniel Narvaez
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Enable gnome-keyring to autostart in sugar-emulator
Hello Daniel,
sorry, been busy...
Sascha and me have discussed this issue thoroughly. The diff itself is easy,
the reasoning behind is not.
So we decided just to tell you how we would write this commit message and
the diff to reflect the situation. The commit message will become the
entry in git log. It's not enough to tell in your own words, what the diff
is doing and giving the place, where this solution is outlined.
You need to extract the relevant information, what you do and why.
Caspar
Subject: Enable gnome-keyring-daemon to start inside the emulated session.
We have the following situation: there is an instance of gnome-keyring-daemon
running on the machine. But sugar-emulator can't access this instance of
gnome-keyring-daemon, as it is outside the scope of sugar-emulator and not
registered with the D-Bus session bus started by sugar-emulator.
D-Bus tries to start a new instance of gnome-keyring-daemon, which fails due
to a set of environment variables related to gnome-keyring-daemon. These
essentially make gnome-keyring-daemon try to initialize the existing instance
of gnome-keyring-daemon outside the scope of sugar-emulator.
By removing these environment variables, D-Bus can start a new instance of
gnome-keyring-daemon and register with the D-Bus session.
See
https://bugzilla.gnome.org/show_bug.cgi?id=628302
and
https://live.gnome.org/GnomeKeyring/RunningDaemon
for more information.
---
bin/sugar.in|6 --
src/jarabe/util/emulator.py |7 +++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/bin/sugar.in b/bin/sugar.in
index 12098db..2df0ab8 100644
--- a/bin/sugar.in
+++ b/bin/sugar.in
@@ -62,12 +62,6 @@ export LANGUAGE="${LANGUAGE:-${LANG}}"
# Set Sugar's telepathy accounts directory
export MC_ACCOUNT_DIR=$HOME/.sugar/$SUGAR_PROFILE/accounts
-# Workaround until gnome-keyring-daemon lets dbus activate it
-# https://bugzilla.gnome.org/show_bug.cgi?id=628302
-if test "$SUGAR_EMULATOR" = "yes" -a "$(type gnome-keyring-daemon)"; then
-gnome-keyring-daemon --components=secrets &
-fi
-
# Source language settings and debug definitions
if [ -f ~/.i18n ]; then
. ~/.i18n
diff --git a/src/jarabe/util/emulator.py b/src/jarabe/util/emulator.py
index fda1b59..db34190 100644
--- a/src/jarabe/util/emulator.py
+++ b/src/jarabe/util/emulator.py
@@ -120,6 +120,13 @@ def _start_window_manager():
def _setup_env(display, scaling, emulator_pid):
+# We need to remove the environment related to gnome-keyring-daemon,
+# so a new instance of gnome-keyring-daemon can be started and
+# registered properly.
+for variable in ['GPG_AGENT_INFO', 'SSH_AUTH_SOCK',
+ 'GNOME_KEYRING_CONTROL', 'GNOME_KEYRING_PID']:
+if variable in os.environ:
+del os.environ[variable]
+
os.environ['SUGAR_EMULATOR'] = 'yes'
os.environ['GABBLE_LOGFILE'] = os.path.join(
env.get_profile_path(), 'logs', 'telepathy-gabble.log')
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
