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

10
src/settings/plugins/ifnet/connection_parser.c
View File

@@ -2808,6 +2808,7 @@ ifnet_update_parsers_by_connection (NMConnection *connection,
const char *config_file,
const char *wpa_file,
gchar **out_new_name,
gchar **out_backup,
GError **error)
{
NMSettingConnection *s_con;
@@ -2891,7 +2892,7 @@ ifnet_update_parsers_by_connection (NMConnection *connection,
/* connection id will be displayed in nm-applet */
update_connection_id (connection, conn_name);
success = ifnet_flush_to_file (config_file);
success = ifnet_flush_to_file (config_file, out_backup);
if (success)
wpa_flush_to_file (wpa_file);
@@ -2905,12 +2906,13 @@ out:
gboolean
ifnet_delete_connection_in_parsers (const char *conn_name,
const char *config_file,
const char *wpa_file)
const char *wpa_file,
gchar **out_backup)
{
gboolean result = FALSE;
ifnet_delete_network (conn_name);
result = ifnet_flush_to_file (config_file);
result = ifnet_flush_to_file (config_file, out_backup);
if (result) {
/* connection may not have security information
* so simply ignore the return value*/
@@ -3005,6 +3007,7 @@ char *
ifnet_add_new_connection (NMConnection *connection,
const char *config_file,
const char *wpa_file,
gchar **out_backup,
GError **error)
{
NMSettingConnection *s_con;
@@ -3048,6 +3051,7 @@ ifnet_add_new_connection (NMConnection *connection,
config_file,
wpa_file,
NULL,
out_backup,
error);
}