Attachment 123832 Details for Bug 95350 – up-tool: Exit early when connecting to upower fails

[patch] up-tool: Exit early when connecting to upower fails

0002-up-tool-Exit-early-when-connecting-to-upower-fails.patch (text/plain), 1.06 KB, created by Martin Pitt on 2016-05-17 15:18:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Pitt

Created: 2016-05-17 15:18:52 UTC

Size: 1.06 KB

patch

obsolete

>From 0454e3e16f010e0bc14acfe302062b64647c0048 Mon Sep 17 00:00:00 2001
>From: Martin Pitt <martin.pitt@ubuntu.com>
>Date: Tue, 17 May 2016 15:36:21 +0200
>Subject: [PATCH 2/2] up-tool: Exit early when connecting to upower fails
>
>This avoids spewing dozens of assertions like
>
>   libupower-glib-CRITICAL **: up_client_get_devices: assertion 'UP_IS_CLIENT (client)' failed
>   libupower-glib-CRITICAL **: up_device_get_object_path: assertion 'UP_IS_DEVICE (device)' failed
>
>and useless default values and then exiting successfully (which might confuse
>clients).
>
>Side issue in https://bugs.freedesktop.org/show_bug.cgi?id=95350
>---
> tools/up-tool.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/tools/up-tool.c b/tools/up-tool.c
>index 44c7a9a..61978a0 100644
>--- a/tools/up-tool.c
>+++ b/tools/up-tool.c
>@@ -286,6 +286,10 @@ main (int argc, char **argv)
> 
> 	loop = g_main_loop_new (NULL, FALSE);
> 	client = up_client_new ();
>+	if (!UP_IS_CLIENT(client)) {
>+		g_warning("Cannot connect to upowerd");
>+		return EXIT_FAILURE;
>+	}
> 
> 	if (opt_version) {
> 		gchar *daemon_version;
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 95350: 123831 | 123832 | 123866 | 123867 | 123872 | 123878 | 123879

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.