diff options
| author | Michael Biebl <biebl@debian.org> | 2017-09-20 21:04:15 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-09-20 21:04:15 +0200 |
| commit | bdb6eeb0670658255c2a4c3c501c0a27fa8cfe55 (patch) | |
| tree | 7f6a4560c8cd3e1730df2af4ed6c3e4c5c0265f6 /src/platform | |
| parent | b9f0451fa35393ceedf6d9d20b78c43578ebea5d (diff) | |
New upstream version 1.8.4 upstream/1.8.4
Diffstat (limited to 'src/platform')
| -rw-r--r-- | src/platform/nm-linux-platform.c | 2 | ||||
| -rw-r--r-- | src/platform/tests/test-route.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 487725e4..6b84c185 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -4230,7 +4230,7 @@ out: /* such an object still exists in the cache. To be sure, refetch it (and * hope it's gone) */ do_request_one_type (platform, NMP_OBJECT_GET_TYPE (obj_id)); - return !!nmp_cache_lookup_obj (priv->cache, obj_id); + return !nmp_cache_lookup_obj (priv->cache, obj_id); } static WaitForNlResponseResult diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c index 6862f13e..9960d867 100644 --- a/src/platform/tests/test-route.c +++ b/src/platform/tests/test-route.c @@ -421,7 +421,8 @@ test_ip4_route_options (void) nmtst_platform_ip4_routes_equal ((NMPlatformIP4Route *) routes->data, rts, routes->len, TRUE); /* Remove route */ - g_assert (nm_platform_ip4_route_delete (NM_PLATFORM_GET, ifindex, network, 24, 20)); + /* FIXME. Due to a bug, we cannot delete routes with non-zero TOS. See bgo#785004. */ + //g_assert (nm_platform_ip4_route_delete (NM_PLATFORM_GET, ifindex, network, 24, 20)); g_array_unref (routes); } |