fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-09 04:10:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyfile: do not set GError over the top of a previous GError

Browse source
This commit is contained in:
Jiří Klimeš 2013-06-27 18:21:08 +02:00
parent 47c5e61515
commit 3fc604ca79
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/settings/plugins/keyfile/writer.c
View file

@ -1022,6 +1022,7 @@ _internal_write_connection (NMConnection *connection,
char *filename = NULL, *path;
const char *id;
WriteInfo info;
GError *local_err = NULL;
if (out_path)
g_return_val_if_fail (*out_path == NULL, FALSE);
@ -1086,7 +1087,16 @@ _internal_write_connection (NMConnection *connection,
if (existing_path != NULL && strcmp (path, existing_path) != 0)
unlink (existing_path);
g_file_set_contents (path, data, len, error);
g_file_set_contents (path, data, len, &local_err);
if (local_err) {
g_set_error (error, KEYFILE_PLUGIN_ERROR, 0,
"%s.%d: error writing to file '%s': %s", __FILE__, __LINE__,
path, local_err->message);
g_error_free (local_err);
g_free (path);
goto out;
}
if (chown (path, owner_uid, owner_grp) < 0) {
g_set_error (error, KEYFILE_PLUGIN_ERROR, 0,
"%s.%d: error chowning '%s': %d", __FILE__, __LINE__,