From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 16 Apr 2016 17:35:02 +0000 (+0100)
Subject: dmesg: --notime should not suppress --show-delta
X-Git-Tag: v2.29-rc1~285^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fdba1750fc9404206b900fac1dfc37772103b022;p=thirdparty%2Futil-linux.git

dmesg: --notime should not suppress --show-delta

The --show-delta is off by default, which means it can be only on when user
has requested to see these time stamps.  The --notime option should not turn
the delta outputing off, because then option order matters and no-one wants
that.  Example of the old output:

$ dmesg --notime --show-delta | sed -n 's/ version.*//p; q'
[<    0.000000>] Linux
$ dmesg --show-delta --notime | sed -n 's/ version.*//p; q'
Linux

Addresses: https://bugs.launchpad.net/bugs/1544595
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index 99cf26e37e..cf93331418 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -1363,7 +1363,6 @@ int main(int argc, char *argv[])
 			break;
 		case 't':
 			ctl.time_fmt = DMESG_TIMEFTM_NONE;
-			delta = 0;
 			break;
 		case 'u':
 			ctl.fltr_fac = 1;