colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifnet: allow testcase to remove backup files (fixes distcheck)

Browse Source 
Can't leave the backup files lying around when doing 'make distcheck',
so when backup up a file, return the backup file path so that the
caller can (optionally) remove it.
This commit is contained in:
Dan Williams
2012-11-30 13:06:32 -06:00
parent e609ca05a2
commit a9077724a9
9 changed files with 63 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/settings/plugins/ifnet/net_utils.c
View File

@@ -950,7 +950,7 @@ get_dhcp_hostname_and_client_id (char **hostname, char **client_id)
g_free (contents);
}
void backup_file (const gchar* target)
gchar *backup_file (const gchar* target)
{
GFile *source, *backup;
gchar* backup_path;
@@ -961,8 +961,11 @@ void backup_file (const gchar* target)
backup = g_file_new_for_path (backup_path);
g_file_copy (source, backup, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, error);
if (error && *error)
if (error && *error) {
PLUGIN_WARN (IFNET_PLUGIN_NAME, "Backup failed: %s", (*error)->message);
g_free (backup_path);
backup_path = NULL;
}
g_free (backup_path);
return backup_path;
}