fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-27 15:10:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: silently ignore duplicated categories in "--order" option (bgo #738613)

Browse source 
It was considered as a hard error before, but we can actually only ignore it.

Related commit: 40e98f5d68
This commit is contained in:
Jiří Klimeš 2015-02-24 13:34:14 +01:00
parent 7c0b43ded6
commit 8b35b9e061
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clients/cli/connections.c
View file

@ -9068,7 +9068,7 @@ parse_preferred_connection_order (const char *order, GError **error)
const char *str;
GArray *order_arr;
NmcSortOrder val;
gboolean inverse;
gboolean inverse, unique;
int i;
strv = nmc_strsplit_set (order, ":", -1);
@ -9103,21 +9103,20 @@ parse_preferred_connection_order (const char *order, GError **error)
_("incorrect item '%s' in '--order' option"), *iter);
break;
}
/* Check duplicates*/
/* Check for duplicates and ignore them. */
unique = TRUE;
for (i = 0; i < order_arr->len; i++) {
if (abs (g_array_index (order_arr, NmcSortOrder, i)) - abs (val) == 0) {
g_array_unref (order_arr);
order_arr = NULL;
g_set_error (error, NMCLI_ERROR, 0,
_("'%s' repeats in '--order' option"), str);
goto end;
unique = FALSE;
break;
}
}
/* Value is ok and unique, add it to the array */
g_array_append_val (order_arr, val);
if (unique)
g_array_append_val (order_arr, val);
}
end:
g_strfreev (strv);
return order_arr;
}