summaryrefslogtreecommitdiffstats
path: root/abs/core/mythtv/stable-0.25/mythtv/myth_settings-2.patch
blob: 5bf0105e671b188cd96b2e249d6829c991f009c5 (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
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;