From 0cbe203d7c32c1c05007e51e01b7de60cb41df40 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 18 Aug 2015 11:25:33 +0200 Subject: [PATCH] supplicant: don't log a warning when scan request fails This downgrades the following warning down to debug-level. Could not get scan request result: GDBus.Error:fi.w1.wpa_supplicant1.Interface.ScanError: Scan request rejected It seems this ~error~ happens regularly, so warning about it is overly alarming. (cherry picked from commit ebc387638a2b4dc4ad607982c627a3e9c403d78e) --- src/supplicant-manager/nm-supplicant-interface.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index e9775a199c..66bab2e397 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -1093,8 +1093,14 @@ scan_request_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) return; - if (error) - nm_log_warn (LOGD_SUPPLICANT, "Could not get scan request result: %s", error->message); + if (error) { + if (_nm_dbus_error_has_name (error, "fi.w1.wpa_supplicant1.Interface.ScanError")) + nm_log_dbg (LOGD_SUPPLICANT, "Could not get scan request result: %s", error->message); + else { + g_dbus_error_strip_remote_error (error); + nm_log_warn (LOGD_SUPPLICANT, "Could not get scan request result: %s", error->message); + } + } g_signal_emit (NM_SUPPLICANT_INTERFACE (user_data), signals[SCAN_DONE], 0, error ? FALSE : TRUE); }