fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-04 22:30:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyfile: cleanup error messages in _internal_write_connection()

Browse source 
A GError should contain a nice, human readable error message. The
file:line prefix looks ugly. Also, the error messages are already
systemwide unique. So a user can easily grep for them and locate
the origin.
This commit is contained in:
Thomas Haller 2015-07-17 11:17:25 +02:00
parent d5d34ec107
commit 238cb02ed6
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -244,6 +244,7 @@ _internal_write_connection (NMConnection *connection,
const char *id;
WriteInfo info = { 0 };
GError *local_err = NULL;
int errsv;
g_return_val_if_fail (!out_path || !*out_path, FALSE);
g_return_val_if_fail (keyfile_dir && keyfile_dir[0] == '/', FALSE);
@ -330,24 +331,26 @@ _internal_write_connection (NMConnection *connection,
g_file_set_contents (path, data, len, &local_err);
if (local_err) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
"%s.%d: error writing to file '%s': %s", __FILE__, __LINE__,
"error writing to file '%s': %s",
path, local_err->message);
g_error_free (local_err);
return FALSE;
}
if (chown (path, owner_uid, owner_grp) < 0) {
errsv = errno;
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
"%s.%d: error chowning '%s': %d", __FILE__, __LINE__,
path, errno);
"error chowning '%s': %s (%d)",
path, g_strerror (errsv), errsv);
unlink (path);
return FALSE;
}
if (chmod (path, S_IRUSR | S_IWUSR) < 0) {
errsv = errno;
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
"%s.%d: error setting permissions on '%s': %d", __FILE__,
__LINE__, path, errno);
"error setting permissions on '%s': %s (%d)",
path, g_strerror (errsv), errsv);
unlink (path);
return FALSE;
}