Hello community, here is the log from the commit of package gconf2 for openSUSE:Factory checked in at 2014-06-18 07:50:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gconf2 (Old) and /work/SRC/openSUSE:Factory/.gconf2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gconf2" Changes: -------- --- /work/SRC/openSUSE:Factory/gconf2/gconf2.changes 2013-03-22 11:15:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gconf2.new/gconf2.changes 2014-06-18 07:52:42.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 15 09:57:09 UTC 2014 - [email protected] + +- Add gconf2-pass-warning-to-caller.patch (bnc#872110) + dbus: Don't spew to console when unable to connect to dbus + daemon instead pass the error up for the caller to decide what + to do. This prevent untrappable warning messages from showing + up at the console if gconftool --makefile-install-rule is called + Backport from upstream. (Ray Strode, commit#b0895e) + +------------------------------------------------------------------- New: ---- gconf2-pass-warning-to-caller.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2.spec ++++++ --- /var/tmp/diff_new_pack.GJy6zs/_old 2014-06-18 07:52:42.000000000 +0200 +++ /var/tmp/diff_new_pack.GJy6zs/_new 2014-06-18 07:52:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gconf2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -47,6 +47,8 @@ Patch4: gconf2-sabayon.patch # PATCH-FIX-OPENSUSE gconf2-pk-default-path.patch [email protected] -- Use the right gconf path for the defaults in the pk helper Patch5: gconf2-pk-default-path.patch +# PATCH-FIX-UPSTREAM gconf2-pass-warning-to-caller.patch bnc#872110 [email protected] +Patch6: gconf2-pass-warning-to-caller.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang = %{version} # gconf-sanity-check was dropped by upstream in GConf 3.2.6 @@ -97,6 +99,7 @@ %patch3 %patch4 %patch5 -p1 +%patch6 -p1 cp -a %{S:1} %{S:2} . %build ++++++ gconf2-pass-warning-to-caller.patch ++++++ diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c index 5610fcf..048e3ea 100644 --- a/gconf/gconf-dbus.c +++ b/gconf/gconf-dbus.c @@ -105,7 +105,7 @@ static GHashTable *engines_by_db = NULL; static GHashTable *engines_by_address = NULL; static gboolean dbus_disconnected = FALSE; -static gboolean ensure_dbus_connection (void); +static gboolean ensure_dbus_connection (GError **error); static gboolean ensure_service (gboolean start_if_not_found, GError **err); static gboolean ensure_database (GConfEngine *conf, @@ -383,7 +383,7 @@ gconf_engine_detach (GConfEngine *conf) } static gboolean -ensure_dbus_connection (void) +ensure_dbus_connection (GError **err) { DBusError error; @@ -392,7 +392,9 @@ ensure_dbus_connection (void) if (dbus_disconnected) { - g_warning ("The connection to DBus was broken. Can't reinitialize it."); + g_set_error (err, GCONF_ERROR, + GCONF_ERROR_NO_SERVER, + "The connection to DBus was broken. Can't reinitialize it."); return FALSE; } @@ -402,7 +404,10 @@ ensure_dbus_connection (void) if (!global_conn) { - g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message); + g_set_error (err, GCONF_ERROR, + GCONF_ERROR_NO_SERVER, + "Client failed to connect to the D-BUS daemon:\n%s", + error.message); dbus_error_free (&error); return FALSE; @@ -431,13 +436,8 @@ ensure_service (gboolean start_if_not_found, if (global_conn == NULL) { - if (!ensure_dbus_connection ()) - { - g_set_error (err, GCONF_ERROR, - GCONF_ERROR_NO_SERVER, - _("No D-BUS daemon running\n")); - return FALSE; - } + if (!ensure_dbus_connection (err)) + return FALSE; g_assert (global_conn != NULL); } @@ -2512,7 +2512,7 @@ gconf_ping_daemon (void) { if (global_conn == NULL) { - if (!ensure_dbus_connection ()) + if (!ensure_dbus_connection (NULL)) { return FALSE; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
