[PATCH iproute2] bridge: make -c match -compressvlans first instead of -color

[PATCH iproute2] bridge: make -c match -compressvlans first instead of -color

[Roopa Prabhu]

From: Roopa Prabhu <roopa@cumulusnetworks.com>

commit c7c1a1ef51ae ("bridge: colorize output and use JSON print library")
broke previous use of -c to represent compressvlans. This restores
previous use of -c to represent compressvlans. Understand the original
motivation to use -c to represent color consistently everywhere but
there are apps and network interface managers out there that are already
using -c to prepresent compressed vlans.

Fixes: c7c1a1ef51ae ("bridge: colorize output and use JSON print library")
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
---
 bridge/bridge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridge/bridge.c b/bridge/bridge.c
index 389f1bd..a3d8154 100644
--- a/bridge/bridge.c
+++ b/bridge/bridge.c
@@ -171,9 +171,9 @@ main(int argc, char **argv)
 			NEXT_ARG();
 			if (netns_switch(argv[1]))
 				exit(-1);
-		} else if (matches_color(opt, &color)) {
 		} else if (matches(opt, "-compressvlans") == 0) {
 			++compress_vlans;
+		} else if (matches_color(opt, &color)) {
 		} else if (matches(opt, "-force") == 0) {
 			++force;
 		} else if (matches(opt, "-json") == 0) {
-- 
2.1.4

Re: [PATCH iproute2] bridge: make -c match -compressvlans first instead of -color

[David Ahern]

On 11/27/18 7:02 PM, Roopa Prabhu wrote:
> From: Roopa Prabhu <roopa@cumulusnetworks.com>
> 
> commit c7c1a1ef51ae ("bridge: colorize output and use JSON print library")
> broke previous use of -c to represent compressvlans. This restores
> previous use of -c to represent compressvlans. Understand the original
> motivation to use -c to represent color consistently everywhere but
> there are apps and network interface managers out there that are already
> using -c to prepresent compressed vlans.
> 
> Fixes: c7c1a1ef51ae ("bridge: colorize output and use JSON print library")
> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
> ---
>  bridge/bridge.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

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

Re: [PATCH iproute2] bridge: make -c match -compressvlans first instead of -color

[Stephen Hemminger]

On Tue, 27 Nov 2018 18:02:52 -0800
Roopa Prabhu <roopa@cumulusnetworks.com> wrote:

> From: Roopa Prabhu <roopa@cumulusnetworks.com>
> 
> commit c7c1a1ef51ae ("bridge: colorize output and use JSON print library")
> broke previous use of -c to represent compressvlans. This restores
> previous use of -c to represent compressvlans. Understand the original
> motivation to use -c to represent color consistently everywhere but
> there are apps and network interface managers out there that are already
> using -c to prepresent compressed vlans.
> 
> Fixes: c7c1a1ef51ae ("bridge: colorize output and use JSON print library")
> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>

Applied.