From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 18 Jan 2019 15:39:58 +0000 (+0100)
Subject: udevadm: print error if the commands fail
X-Git-Tag: v242-rc1~280^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0b60b8a1b16217d9167d03c1c0ee7e4a362514f;p=thirdparty%2Fsystemd.git

udevadm: print error if the commands fail

We'd exit with an error but no output. Print the error in the usual fashion.
---

diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c
index b2fe69a1fd9..01f67942970 100644
--- a/src/udev/udevadm-control.c
+++ b/src/udev/udevadm-control.c
@@ -95,7 +95,7 @@ int control_main(int argc, char *argv[], void *userdata) {
                 case 'e':
                         r = udev_ctrl_send_exit(uctrl, timeout);
                         if (r < 0)
-                                return r;
+                                return log_error_errno(r, "Failed to send exit request: %m");
                         break;
                 case 'l':
                         r = log_level_from_string(optarg);
@@ -104,22 +104,22 @@ int control_main(int argc, char *argv[], void *userdata) {
 
                         r = udev_ctrl_send_set_log_level(uctrl, r, timeout);
                         if (r < 0)
-                                return r;
+                                return log_error_errno(r, "Failed to send request to set log level: %m");
                         break;
                 case 's':
                         r = udev_ctrl_send_stop_exec_queue(uctrl, timeout);
                         if (r < 0)
-                                return r;
+                                return log_error_errno(r, "Failed to send request to stop exec queue: %m");
                         break;
                 case 'S':
                         r = udev_ctrl_send_start_exec_queue(uctrl, timeout);
                         if (r < 0)
-                                return r;
+                                return log_error_errno(r, "Failed to send request to start exec queue: %m");
                         break;
                 case 'R':
                         r = udev_ctrl_send_reload(uctrl, timeout);
                         if (r < 0)
-                                return r;
+                                return log_error_errno(r, "Failed to send reload request: %m");
                         break;
                 case 'p':
                         if (!strchr(optarg, '='))
@@ -127,7 +127,7 @@ int control_main(int argc, char *argv[], void *userdata) {
 
                         r = udev_ctrl_send_set_env(uctrl, optarg, timeout);
                         if (r < 0)
-                                return r;
+                                return log_error_errno(r, "Failed to send request to update environment: %m");
                         break;
                 case 'm': {
                         unsigned i;
@@ -138,7 +138,7 @@ int control_main(int argc, char *argv[], void *userdata) {
 
                         r = udev_ctrl_send_set_children_max(uctrl, i, timeout);
                         if (r < 0)
-                                return r;
+                                return log_error_errno(r, "Failed to send request to set number of children: %m");
                         break;
                 }
                 case ARG_PING: