diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-07-03 12:23:57 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-07-07 18:32:04 +0200 |
| commit | 897d58cf55c7960c2db221429983fc7ca30c3abd (patch) | |
| tree | 7fd6c23129a079cf3ee321f00c505c79f6678d5c | |
| parent | 71febc5c843f60368be534ed00914acda52067d3 (diff) | |
| download | NetworkManager-th/misc-bgo752087.tar.gz | |
core: print connection path in nm_utils_log_connection_diff()th/misc-bgo752087
| -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 4ca8bc89b6..fd8e951fc3 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -2526,11 +2526,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)) { |