Mailinglist Archive: yast-commit (939 mails)

[lslezak@xxxxxxxxxxxxxxxx]

Author: lslezak
Date: Mon Nov  3 12:00:55 2008
New Revision: 52826

URL: http://svn.opensuse.org/viewcvs/yast?rev=52826&view=rev
Log:
- fixed testing of the result of polkit_caller_new_from_dbus_name()
  call which sometime sets the error object even when there is no
  real error (bnc#439150)
- 2.17.20

Modified:
    trunk/core/VERSION
    trunk/core/liby2dbus/src/PolKit.cc
    trunk/core/package/yast2-core.changes

Modified: trunk/core/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=52826&r1=52825&r2=52826&view=diff
==============================================================================
--- trunk/core/VERSION (original)
+++ trunk/core/VERSION Mon Nov  3 12:00:55 2008
@@ -1 +1 @@
-2.17.19
+2.17.20

Modified: trunk/core/liby2dbus/src/PolKit.cc
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2dbus/src/PolKit.cc?rev=52826&r1=52825&r2=52826&view=diff
==============================================================================
--- trunk/core/liby2dbus/src/PolKit.cc (original)
+++ trunk/core/liby2dbus/src/PolKit.cc Mon Nov  3 12:00:55 2008
@@ -25,11 +25,22 @@
     y2debug("Checking action %s from %s", action_id.c_str(), 
dbus_caller.c_str());
 
     PolKitCaller *pk_caller = polkit_caller_new_from_dbus_name(con, 
dbus_caller.c_str(), &dbus_error);
+
     if (dbus_error_is_set (&dbus_error))
     {
-       y2error ("dbus error: %s: %s", dbus_error.name, dbus_error.message);
+       // PolKit sometimes sets the error even if the PolKitCaller object has 
been successfully returned
+       // see bnc#439150
+       if (pk_caller == NULL)
+       {
+           y2error ("dbus error: %s: %s", dbus_error.name, dbus_error.message);
+       }
+
        dbus_error_free (&dbus_error);
-       return false;
+
+       if (pk_caller == NULL)
+       {
+           return false;
+       }
    }
 
     if (pk_caller == NULL)

Modified: trunk/core/package/yast2-core.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?rev=52826&r1=52825&r2=52826&view=diff
==============================================================================
--- trunk/core/package/yast2-core.changes (original)
+++ trunk/core/package/yast2-core.changes Mon Nov  3 12:00:55 2008
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Mon Nov  3 11:55:50 CET 2008 - lslezak@xxxxxxx
+
+- fixed testing of the result of polkit_caller_new_from_dbus_name()
+  call which sometime sets the error object even when there is no
+  real error (bnc#439150)
+- 2.17.20
+
+-------------------------------------------------------------------
 Fri Oct 24 15:54:54 CEST 2008 - visnov@xxxxxxx
 
 - Also print diff when agent-process testsuite fails

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx