diff options
Diffstat (limited to 'abs/core/mythtv/stable-0.25/mythtv/myth_settings-2.patch')
-rwxr-xr-x | abs/core/mythtv/stable-0.25/mythtv/myth_settings-2.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/abs/core/mythtv/stable-0.25/mythtv/myth_settings-2.patch b/abs/core/mythtv/stable-0.25/mythtv/myth_settings-2.patch new file mode 100755 index 0000000..5bf0105 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythtv/myth_settings-2.patch @@ -0,0 +1,37 @@ +diff --git a/mythtv/programs/mythutil/settingsutils.cpp b/mythtv/programs/mythutil/settingsutils.cpp +index ff7e509..fdb05d6 100644 +--- a/mythtv/programs/mythutil/settingsutils.cpp ++++ b/mythtv/programs/mythutil/settingsutils.cpp +@@ -382,6 +382,16 @@ 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; ++ continue; ++ } ++ } ++ else + //perform insert + gCoreContext->import_settings(value_pair_map,table_name); + } +@@ -454,7 +464,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 +509,7 @@ static int ExportSettings(const MythUtilCommandLineParser &cmdline) + } + } + QFile file( export_filename ); ++ + if( !file.open(QIODevice::WriteOnly) ) + return -1; + |