diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-07-03 12:23:57 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-08-20 18:05:43 +0200 |
| commit | d7e36972c7b15ad09584f29cf4b44aaa5640df17 (patch) | |
| tree | 3ff1b2962d4b15f18dc7de9408e150affe02a2b8 | |
| parent | f202a16026e14de47ee0911220fcd3aa74ded17d (diff) | |
| download | NetworkManager-d7e36972c7b15ad09584f29cf4b44aaa5640df17.tar.gz | |
core: print connection path in nm_utils_log_connection_diff()
(cherry picked from commit 4c48f66d3dd01e521453bd464639ac1d4db3da59)
| -rw-r--r-- | src/NetworkManagerUtils.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 1e11f063c0..63741dc3dc 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -2532,11 +2532,15 @@ nm_utils_log_connection_diff (NMConnection *connection, NMConnection *diff_base, if (print_header) { GError *err_verify = NULL; + const char *path = nm_connection_get_path (connection); - if (diff_base) - nm_log (level, domain, "%sconnection '%s' (%p/%s < %p/%s):", prefix, name, connection, G_OBJECT_TYPE_NAME (connection), diff_base, G_OBJECT_TYPE_NAME (diff_base)); - else - nm_log (level, domain, "%sconnection '%s' (%p/%s):", prefix, name, connection, G_OBJECT_TYPE_NAME (connection)); + if (diff_base) { + nm_log (level, domain, "%sconnection '%s' (%p/%s < %p/%s)%s%s%s:", prefix, name, connection, G_OBJECT_TYPE_NAME (connection), diff_base, G_OBJECT_TYPE_NAME (diff_base), + NM_PRINT_FMT_QUOTED (path, " [", path, "]", "")); + } else { + nm_log (level, domain, "%sconnection '%s' (%p/%s):%s%s%s", prefix, name, connection, G_OBJECT_TYPE_NAME (connection), + NM_PRINT_FMT_QUOTED (path, " [", path, "]", "")); + } print_header = FALSE; if (!nm_connection_verify (connection, &err_verify)) { |