From: David Ahern <dsahern@gmail.com>
Date: Wed, 14 Mar 2018 00:48:10 +0000 (-0700)
Subject: Merge branch 'iproute2-master' into iproute2-next
X-Git-Tag: v4.17.0~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9625d6aead11c7ca8b64af3ad06ea451e06ea9e;p=thirdparty%2Fiproute2.git

Merge branch 'iproute2-master' into iproute2-next

Conflicts:
	bridge/mdb.c

Updated bridge/bridge.c per removal of check_if_color_enabled by commit
1ca4341d2c6b ("color: disable color when json output is requested")

Signed-off-by: David Ahern <dsahern@gmail.com>
---

e9625d6aead11c7ca8b64af3ad06ea451e06ea9e
diff --cc bridge/bridge.c
index e5b4c3c21,48fe1c8b2..7fcfe1116
--- a/bridge/bridge.c
+++ b/bridge/bridge.c
@@@ -200,9 -193,6 +200,9 @@@ main(int argc, char **argv
  
  	_SL_ = oneline ? "\\" : "\n";
  
- 	if (json)
- 		check_if_color_enabled();
++	if (color && !json)
++		enable_color();
 +
  	if (batch_file)
  		return batch(batch_file);