udevadm-trigger: reject invalid wait-daemon timeout

Return from argument parsing when --wait-daemon= cannot be parsed.

This matches the other timeout options.

Reproducer:
  udevadm trigger --dry-run --wait-daemon=bad

Before:
  Failed to parse timeout value 'bad', ignoring: Invalid argument

Follow-up:
  2001622c58c1989f386086d11bd2a00d5fe00a30

diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
index e1fdf323cbc206ee1929d60e95e1aca316afc1e4..f1cdbfe1051778a4044c36f718d3cf8f7addabba 100644 (file)
--- a/src/udev/udevadm-trigger.c
+++ b/src/udev/udevadm-trigger.c
@@ -469,7 +469,7 @@ static int parse_argv(int argc, char *argv[]) {
                         if (opts.arg) {
                                 r = parse_sec(opts.arg, &arg_ping_timeout_usec);
                                 if (r < 0)
-                                        log_error_errno(r, "Failed to parse timeout value '%s', ignoring: %m", opts.arg);
+                                        return log_error_errno(r, "Failed to parse timeout value '%s': %m", opts.arg);
                         }
                         break;
 

diff --git a/test/units/TEST-17-UDEV.sanity-check.sh b/test/units/TEST-17-UDEV.sanity-check.sh
index 7de2a36722a33308f4c0d3d2620e623d4d8ca9a2..d283aae318cec26eb8335dc41254f8daa5ab32df 100755 (executable)
--- a/test/units/TEST-17-UDEV.sanity-check.sh
+++ b/test/units/TEST-17-UDEV.sanity-check.sh
@@ -282,6 +282,7 @@ udevadm trigger --parent-match /sys/class/net/$netdev --name-match /dev/null
 udevadm trigger --initialized-match
 udevadm trigger --initialized-nomatch
 udevadm trigger -w
+(! udevadm trigger --dry-run --wait-daemon=bad)
 udevadm trigger --uuid /sys/class/net/$netdev
 udevadm settle -t 300
 udevadm trigger --wait-daemon