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

platform: don't log error for delete_object() if IPv6 address doesn't exist

Browse Source 
This causes root platform tests to fail on rhel-7

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-06-03 15:45:09 +02:00
parent 8b41e6e2ea
commit a895b58484
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/platform/nm-linux-platform.c
View File

@@ -1535,13 +1535,22 @@ delete_object (NMPlatform *platform, struct nl_object *obj, gboolean do_refresh_
debug("delete_object failed with \"%s\" (%d), meaning the object was already removed", debug("delete_object failed with \"%s\" (%d), meaning the object was already removed",
nl_geterror (nle), nle); nl_geterror (nle), nle);
break; break;
case -NLE_FAILURE:
if (object_type == OBJECT_TYPE_IP6_ADDRESS) {
/* On RHEL7 kernel, deleting a non existing address fails with ENXIO (which libnl maps to NLE_FAILURE) */
debug("delete_object for address failed with \"%s\" (%d), meaning the address was already removed",
nl_geterror (nle), nle);
break;
}
goto DEFAULT;
case -NLE_NOADDR: case -NLE_NOADDR:
if (object_type == OBJECT_TYPE_IP4_ADDRESS || object_type == OBJECT_TYPE_IP6_ADDRESS) { if (object_type == OBJECT_TYPE_IP4_ADDRESS || object_type == OBJECT_TYPE_IP6_ADDRESS) {
debug("delete_object for address failed with \"%s\" (%d), meaning the address was already removed", debug("delete_object for address failed with \"%s\" (%d), meaning the address was already removed",
nl_geterror (nle), nle); nl_geterror (nle), nle);
break; break;
} }
/* fall-through to error, because we only expect this for addresses. */ goto DEFAULT;
DEFAULT:
default: default:
error ("Netlink error deleting %s: %s", to_string_object (platform, obj), nl_geterror (nle)); error ("Netlink error deleting %s: %s", to_string_object (platform, obj), nl_geterror (nle));
return FALSE; return FALSE;