Attachment 125008 Details for Bug 96653 – update-activation-environment: produce better diagnostics on error

[patch] update-activation-environment: produce better diagnostics on error

0001-update-activation-environment-produce-better-diagnos.patch (text/plain), 1.61 KB, created by Simon McVittie on 2016-07-11 10:32:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-07-11 10:32:31 UTC

Size: 1.61 KB

patch

obsolete

>From fda316373dfbd396fd73b9a3242ab1dbf2a459e8 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@debian.org>
>Date: Mon, 11 Jul 2016 10:52:44 +0100
>Subject: [PATCH] update-activation-environment: produce better diagnostics on
> error
>
>If dbus-daemon or systemd replied to our method call with an error,
>we would report it as "invalid arguments" instead of the true error
>name and message.
>
>Same root cause as <https://bugs.freedesktop.org/show_bug.cgi?id=96653>.
>
>Signed-off-by: Simon McVittie <smcv@debian.org>
>---
> tools/dbus-update-activation-environment.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/tools/dbus-update-activation-environment.c b/tools/dbus-update-activation-environment.c
>index 6c53d8e..160ac5d 100644
>--- a/tools/dbus-update-activation-environment.c
>+++ b/tools/dbus-update-activation-environment.c
>@@ -378,7 +378,8 @@ next:
>       exit (EX_UNAVAILABLE);
>     }
> 
>-  if (!dbus_message_get_args (msg, &error, DBUS_TYPE_INVALID))
>+  if (dbus_set_error_from_message (&error, msg) ||
>+      !dbus_message_get_args (msg, &error, DBUS_TYPE_INVALID))
>     {
>       fprintf (stderr,
>           "%s: error from dbus-daemon: %s: %s\n",
>@@ -402,7 +403,8 @@ next:
>               "%s: warning: error sending to systemd: %s: %s\n",
>               PROGNAME, error.name, error.message);
>         }
>-      else if (!dbus_message_get_args (msg, &error, DBUS_TYPE_INVALID))
>+      else if (dbus_set_error_from_message (&error, msg) ||
>+          !dbus_message_get_args (msg, &error, DBUS_TYPE_INVALID))
>         {
>           fprintf (stderr,
>               "%s: warning: error from systemd: %s: %s\n",
>-- 
>2.8.1
>

Actions: View | Splinter Review

Attachments on bug 96653: 124680 | 124681 | 124682 | 125008 | 125009

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.