blob: 4e834739aa2cb94bfc0c2840de32ff555a6c22ff (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
diff --git a/mythtv/programs/mythutil/settingsutils.cpp b/mythtv/programs/mythutil/settingsutils.cpp
index ff7e509..d229f27 100644
--- a/mythtv/programs/mythutil/settingsutils.cpp
+++ b/mythtv/programs/mythutil/settingsutils.cpp
@@ -382,6 +382,17 @@ static int ImportSettings(const MythUtilCommandLineParser &cmdline)
else
value_pair_map[record_element.nodeName()] = record_element.text();
}
+ if (import_filename.endsWith("syssettings.xml"))
+ {
+ if ( value_pair_map["value"] == "BackendServerIP")
+ {
+ out_string = "sysettings, ignoring backendserver ip record";
+ cout << out_string.toLocal8Bit().constData() << endl;
+ }
+ else
+ gCoreContext->import_settings(value_pair_map,table_name);
+ }
+ else
//perform insert
gCoreContext->import_settings(value_pair_map,table_name);
}
@@ -454,7 +465,6 @@ static int ExportSettings(const MythUtilCommandLineParser &cmdline)
QDomElement tag = doc.createElement(y.key());
record.appendChild(tag);
QDomText t;
-
if ( distro_default == TRUE )
{ // If exporting distro_default then change hostname + table
if ( y.key() == "hostname" )
@@ -500,6 +510,7 @@ static int ExportSettings(const MythUtilCommandLineParser &cmdline)
}
}
QFile file( export_filename );
+
if( !file.open(QIODevice::WriteOnly) )
return -1;
|
