|
 |
fc9aca |
From 7e13e49f15a43f54391380c76f7074bdaa300d03 Mon Sep 17 00:00:00 2001
|
|
|
fc9aca |
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
|
fc9aca |
Date: Sun, 11 Jun 2017 22:31:43 +0200
|
|
|
fc9aca |
Subject: [PATCH] cli: remove spurious device names from output
|
|
|
fc9aca |
|
|
|
fc9aca |
When running one of:
|
|
|
fc9aca |
|
|
|
fc9aca |
nmcli device wifi list ifname wlan0
|
|
|
fc9aca |
nmcli device wifi connect ... ifname wlan0
|
|
|
fc9aca |
|
|
|
fc9aca |
nmcli wrongly adds the device name to the output.
|
|
|
fc9aca |
|
|
|
fc9aca |
Do the completion only when requested.
|
|
|
fc9aca |
|
|
|
fc9aca |
Fixes: 8679793f6b711847d3209ab3cfbd95ab4a2e2488
|
|
|
fc9aca |
Fixes: 1a0dfd31c4af5f3e42b4fc8363a2065d8c5a325b
|
|
|
fc9aca |
(cherry picked from commit d2b4332b36686dd5d7382d996743f0ffa1a0fdda)
|
|
|
fc9aca |
(cherry picked from commit 73e664e3b15e47b20dcdc92d4cde7f8492069f17)
|
|
|
fc9aca |
---
|
|
|
fc9aca |
clients/cli/devices.c | 6 ++++--
|
|
|
fc9aca |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
fc9aca |
|
|
|
fc9aca |
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
|
|
|
fc9aca |
index 387edef..50983de 100644
|
|
|
fc9aca |
--- a/clients/cli/devices.c
|
|
|
fc9aca |
+++ b/clients/cli/devices.c
|
|
|
fc9aca |
@@ -2653,7 +2653,8 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
|
|
|
fc9aca |
return NMC_RESULT_ERROR_USER_INPUT;
|
|
|
fc9aca |
}
|
|
|
fc9aca |
ifname = *argv;
|
|
|
fc9aca |
- complete_device (devices, ifname, TRUE);
|
|
|
fc9aca |
+ if (argc == 1 && nmc->complete)
|
|
|
fc9aca |
+ complete_device (devices, ifname, TRUE);
|
|
|
fc9aca |
} else if (strcmp (*argv, "bssid") == 0 || strcmp (*argv, "hwaddr") == 0) {
|
|
|
fc9aca |
/* hwaddr is deprecated and will be removed later */
|
|
|
fc9aca |
argc--;
|
|
|
fc9aca |
@@ -2900,7 +2901,8 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
|
|
|
fc9aca |
goto finish;
|
|
|
fc9aca |
}
|
|
|
fc9aca |
ifname = *argv;
|
|
|
fc9aca |
- complete_device (devices, ifname, TRUE);
|
|
|
fc9aca |
+ if (argc == 1 && nmc->complete)
|
|
|
fc9aca |
+ complete_device (devices, ifname, TRUE);
|
|
|
fc9aca |
} else if (strcmp (*argv, "bssid") == 0) {
|
|
|
fc9aca |
argc--;
|
|
|
fc9aca |
argv++;
|
|
|
fc9aca |
--
|
|
|
fc9aca |
2.9.3
|
|
|
fc9aca |
|