cli: strip errors from D-Bus before presenting to a user

3 files changed, 41 insertions, 24 deletions

diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index a7e71c705b..240d0d2a10 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -14,7 +14,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2010 - 2014 Red Hat, Inc.
+ * Copyright 2010 - 2014 Red Hat, Inc.
  */
 
 #include "config.h"
@@ -1803,7 +1803,9 @@ activate_connection_cb (GObject *client, GAsyncResult *result, gpointer user_dat
 	active = nm_client_activate_connection_finish (NM_CLIENT (client), result, &error);
 
 	if (error) {
-		g_string_printf (nmc->return_text, _("Error: Connection activation failed: %s"), error->message);
+		g_dbus_error_strip_remote_error (error);
+		g_string_printf (nmc->return_text, _("Error: Connection activation failed: %s"),
+		                 error->message);
 		g_error_free (error);
 		nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
 		quit ();
@@ -4878,6 +4880,7 @@ add_connection_cb (GObject *settings,
 	connection = nm_remote_settings_add_connection_finish (NM_REMOTE_SETTINGS (settings),
 	                                                       result, &error);
 	if (error) {
+		g_dbus_error_strip_remote_error (error);
 		g_string_printf (nmc->return_text,
 		                 _("Error: Failed to add '%s' connection: %s"),
 		                 info->con_name, error->message);
@@ -7381,11 +7384,11 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 					g_cond_wait (&nmc_editor_cond, &nmc_editor_mutex);
 
 				if (nmc_editor_error) {
-					g_print (_("Error: Failed to save '%s' (%s) connection: (%d) %s\n"),
+					g_dbus_error_strip_remote_error (nmc_editor_error);
+					g_print (_("Error: Failed to save '%s' (%s) connection: %s\n"),
 					         nm_connection_get_id (connection),
 					         nm_connection_get_uuid (connection),
-					         nmc_editor_error->code, nmc_editor_error->message);
-
+					         nmc_editor_error->message);
 					g_error_free (nmc_editor_error);
 				} else {
 					g_print (!rem_con ?
@@ -7469,10 +7472,11 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 				g_cond_wait (&nmc_editor_cond, &nmc_editor_mutex);
 
 			if (nmc_editor_error) {
-				g_print (_("Error: Failed to activate '%s' (%s) connection: (%d) %s\n"),
+				g_dbus_error_strip_remote_error (nmc_editor_error);
+				g_print (_("Error: Failed to activate '%s' (%s) connection: %s\n"),
 				         nm_connection_get_id (connection),
 				         nm_connection_get_uuid (connection),
-				         nmc_editor_error->code, nmc_editor_error->message);
+				         nmc_editor_error->message);
 				g_error_free (nmc_editor_error);
 			} else {
 				g_print (_("Monitoring connection activation (press any key to continue)\n"));
@@ -7922,6 +7926,7 @@ modify_connection_cb (GObject *connection,
 
 	if (!nm_remote_connection_commit_changes_finish (NM_REMOTE_CONNECTION (connection),
 	                                                 result, &error)) {
+		g_dbus_error_strip_remote_error (error);
 		g_string_printf (nmc->return_text,
 		                 _("Error: Failed to modify connection '%s': %s"),
 		                 nm_connection_get_id (NM_CONNECTION (connection)),
@@ -8134,7 +8139,9 @@ delete_cb (GObject *con, GAsyncResult *result, gpointer user_data)
 	GError *error = NULL;
 
 	if (!nm_remote_connection_delete_finish (NM_REMOTE_CONNECTION (con), result, &error)) {
-		g_string_printf (info->nmc->return_text, _("Error: Connection deletion failed: %s"), error->message);
+		g_dbus_error_strip_remote_error (error);
+		g_string_printf (info->nmc->return_text, _("Error: Connection deletion failed: %s"),
+		                 error->message);
 		g_error_free (error);
 		info->nmc->return_value = NMC_RESULT_ERROR_CON_DEL;
 	}
@@ -8257,11 +8264,10 @@ do_connection_reload (NmCli *nmc, int argc, char **argv)
 	}
 
 	if (!nm_remote_settings_reload_connections (nmc->system_settings, NULL, &error)) {
-		g_string_printf (nmc->return_text, _("Error: %s."), error->message);
-		if (error->code == NM_REMOTE_SETTINGS_ERROR_SERVICE_UNAVAILABLE)
-			nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING;
-		else
-			nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
+		g_dbus_error_strip_remote_error (error);
+		g_string_printf (nmc->return_text, _("Error: failed to reload connections: %s."),
+		                 error->message);
+		nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
 		g_clear_error (&error);
 	}
 
@@ -8298,7 +8304,9 @@ do_connection_load (NmCli *nmc, int argc, char **argv)
 	nm_remote_settings_load_connections (nmc->system_settings, filenames, &failures, NULL, &error);
 	g_free (filenames);
 	if (error) {
-		g_string_printf (nmc->return_text, _("Error: %s."), error->message);
+		g_dbus_error_strip_remote_error (error);
+		g_string_printf (nmc->return_text, _("Error: failed to load connection: %s."),
+		                 error->message);
 		nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
 		g_error_free (error);
 	}
@@ -8424,7 +8432,9 @@ do_connections (NmCli *nmc, int argc, char **argv)
 
 	/* Get NMRemoteSettings object */
 	if (!(nmc->system_settings = nm_remote_settings_new (NULL, &error))) {
-		g_string_printf (nmc->return_text, _("Error: Could not get system settings: %s."), error->message);
+		g_dbus_error_strip_remote_error (error);
+		g_string_printf (nmc->return_text, _("Error: could not get remote settings: %s."),
+		                 error->message);
 		g_error_free (error);
 		nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
 		nmc->should_wait = FALSE;
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index fc88309212..903096d08f 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -14,7 +14,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2010 - 2014 Red Hat, Inc.
+ * Copyright 2010 - 2014 Red Hat, Inc.
  */
 
 #include "config.h"
@@ -1408,6 +1408,7 @@ add_and_activate_cb (GObject *client,
 	active = nm_client_add_and_activate_connection_finish (NM_CLIENT (client), result, &error);
 
 	if (error) {
+		g_dbus_error_strip_remote_error (error);
 		g_string_printf (nmc->return_text, _("Error: Failed to add/activate new connection: %s"),
 		                 error->message);
 		g_error_free (error);
@@ -1494,6 +1495,7 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data)
 		}
 		g_free (dbus_err);
 
+		g_dbus_error_strip_remote_error (error);
 		g_string_printf (nmc->return_text, _("Error: Device activation failed: %s"),
 		                 error->message);
 		g_error_free (error);
@@ -1636,6 +1638,7 @@ disconnect_device_cb (GObject *object, GAsyncResult *result, gpointer user_data)
 	GError *error = NULL;
 
 	if (!nm_device_disconnect_finish (device, result, &error)) {
+		g_dbus_error_strip_remote_error (error);
 		g_string_printf (nmc->return_text, _("Error: Device '%s' (%s) disconnecting failed: %s"),
 		                 nm_device_get_iface (device),
 		                 nm_object_get_path (NM_OBJECT (device)),
@@ -1741,6 +1744,7 @@ delete_device_cb (GObject *object, GAsyncResult *result, gpointer user_data)
 	GError *error = NULL;
 
 	if (!nm_device_delete_finish (device, result, &error)) {
+		g_dbus_error_strip_remote_error (error);
 		g_string_printf (nmc->return_text, _("Error: Device '%s' (%s) deletion failed: %s"),
 		                 nm_device_get_iface (device),
 		                 nm_object_get_path (NM_OBJECT (device)),
@@ -2424,6 +2428,7 @@ request_rescan_cb (GObject *object, GAsyncResult *result, gpointer user_data)
 
 	nm_device_wifi_request_scan_finish (NM_DEVICE_WIFI (object), result, &error);
 	if (error) {
+		g_dbus_error_strip_remote_error (error);
 		g_string_printf (nmc->return_text, _("Error: %s."), error->message);
 		nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
 		g_error_free (error);
diff --git a/clients/cli/general.c b/clients/cli/general.c
index b3b24cae0a..b9adb3fe8e 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -542,8 +542,9 @@ save_hostname_cb (GObject *object, GAsyncResult *result, gpointer user_data)
 
 	nm_remote_settings_save_hostname_finish (NM_REMOTE_SETTINGS (object), result, &error);
 	if (error) {
-		g_string_printf (nmc->return_text, _("Error: failed to set hostname: (%d) %s"),
-		                 error->code, error->message);
+		g_dbus_error_strip_remote_error (error);
+		g_string_printf (nmc->return_text, _("Error: failed to set hostname: %s"),
+		                 error->message);
 		nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
 		g_error_free (error);
 	}
@@ -593,7 +594,9 @@ do_general (NmCli *nmc, int argc, char **argv)
 
 			/* get system settings */
 			if (!(rem_settings = nm_remote_settings_new (NULL, &error))) {
-				g_string_printf (nmc->return_text, _("Error: Could not get system settings: %s."), error->message);
+				g_dbus_error_strip_remote_error (error);
+				g_string_printf (nmc->return_text, _("Error: Could not get system settings: %s."),
+				                 error->message);
 				g_clear_error (&error);
 				nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
 				goto finish;
@@ -660,11 +663,10 @@ do_general (NmCli *nmc, int argc, char **argv)
 				nmc->get_client (nmc); /* create NMClient */
 				nm_client_set_logging (nmc->client, level, domains, &error);
 				if (error) {
-					if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_AUTH_FAILED))
-						g_string_printf (nmc->return_text, _("Error: access denied to set logging; %s"), error->message);
-					else
-						g_string_printf (nmc->return_text, _("Error: %s"), error->message);
-					nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
+					g_dbus_error_strip_remote_error (error);
+					g_string_printf (nmc->return_text, _("Error: failed to set logging: %s"),
+					                 error->message);
+					nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
 					goto finish;
 				}
 			}