]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
dmesg: inform user --show-delta and iso8601 time format does not mix
authorSami Kerola <kerolasa@iki.fi>
Sun, 7 Jul 2013 19:54:25 +0000 (20:54 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 9 Jul 2013 12:24:53 +0000 (14:24 +0200)
References: http://marc.info/?l=util-linux-ng&m=137267606929951&w=2
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
sys-utils/dmesg.c

index e6819308cf3fcd143c03259742dbb2229d356a04..88713d55db07b7504955c0845b8d58defcc5a518 100644 (file)
@@ -1364,6 +1364,9 @@ int main(int argc, char *argv[])
                case DMESG_TIMEFTM_TIME:
                        ctl.time_fmt = DMESG_TIMEFTM_TIME_DELTA;
                        break;
+               case DMESG_TIMEFTM_ISO8601:
+                       warnx(_("--show-delta is ignored when used together with iso8601 time format"));
+                       break;
                default:
                        ctl.time_fmt = DMESG_TIMEFTM_DELTA;
                }