colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: fix nmcli device wifi list --rescan=yes to wait

Browse Source 
Fixes: db396cea9d ('cli: rework do_device_wifi_list() to scan and print Wi-Fi list')
This commit is contained in:
Thomas Haller
2020-04-02 12:01:18 +02:00
parent b6fdc30a88
commit 93a6bcc8a2
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
clients/cli/devices.c
View File

@@ -2922,7 +2922,6 @@ wifi_list_finish (WifiListData *wifi_list_data,
guint i; guint i;
if ( !force_finished if ( !force_finished
&& scan_info->rescan_cutoff_msec != G_MAXINT64
&& scan_info->rescan_cutoff_msec > _device_wifi_get_last_scan (wifi_list_data->wifi)) { && scan_info->rescan_cutoff_msec > _device_wifi_get_last_scan (wifi_list_data->wifi)) {
/* wait longer... */ /* wait longer... */
return; return;
@@ -3115,7 +3114,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
else if (nm_streq (rescan, "no")) else if (nm_streq (rescan, "no"))
rescan_cutoff_msec = G_MININT64; rescan_cutoff_msec = G_MININT64;
else if (nm_streq (rescan, "yes")) else if (nm_streq (rescan, "yes"))
rescan_cutoff_msec = G_MAXINT64; rescan_cutoff_msec = nm_utils_get_timestamp_msec ();
else { else {
g_string_printf (nmc->return_text, _("Error: invalid rescan argument: '%s' not among [auto, no, yes]"), rescan); g_string_printf (nmc->return_text, _("Error: invalid rescan argument: '%s' not among [auto, no, yes]"), rescan);
return NMC_RESULT_ERROR_USER_INPUT; return NMC_RESULT_ERROR_USER_INPUT;