diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-30 00:57:20 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-30 00:57:20 +0200 |
| commit | db70f92a77334e84ca9a04379afd49ea55c53098 (patch) | |
| tree | d91e6ec27d66ec3c5a20c9195a0eb1d834189618 /src/devices/nm-device-factory.c | |
| parent | 4a76b5857faa586add8d7ce28f7804ffb65f3c68 (diff) | |
| parent | d9c99a29a0d3384c9c3d2adce430f5cb1134ab6a (diff) | |
Merge tag 'upstream/1.1.92'
Upstream version 1.1.92
Diffstat (limited to 'src/devices/nm-device-factory.c')
| -rw-r--r-- | src/devices/nm-device-factory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c index bd0ec002..5ce4333f 100644 --- a/src/devices/nm-device-factory.c +++ b/src/devices/nm-device-factory.c @@ -355,7 +355,7 @@ read_device_factory_paths (void) if (!dir) { nm_log_warn (LOGD_HW, "device plugin: failed to open directory %s: %s", NMPLUGINDIR, - (error && error->message) ? error->message : "(unknown)"); + error->message); g_clear_error (&error); return NULL; } @@ -499,7 +499,7 @@ nm_device_factory_manager_load_factories (NMDeviceFactoryManagerFactoryFunc call factory = create_func (&error); if (!factory) { nm_log_warn (LOGD_HW, "(%s): failed to initialize device factory: %s", - item, error ? error->message : "unknown"); + item, NM_G_ERROR_MSG (error)); g_clear_error (&error); g_module_close (plugin); continue; |