From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 7 Jul 2013 19:54:25 +0000 (+0100)
Subject: dmesg: inform user --show-delta and iso8601 time format does not mix
X-Git-Tag: v2.24-rc1~445
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7ba987a04b78189177987c42eb6ffed439b1c4b;p=thirdparty%2Futil-linux.git

dmesg: inform user --show-delta and iso8601 time format does not mix

References: http://marc.info/?l=util-linux-ng&m=137267606929951&w=2
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index e6819308cf..88713d55db 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -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;
 		}