Restore the schema wizard's previous functionality.

This uses a different approach to achieve the behavior desired in SHA: 6fe2330 SHA: 9fa2cd7
MythTV · Dec 11, 2010 · a589a0d · a589a0d
1 parent 2b2568c
commit a589a0d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/mythtv/libs/libmyth/schemawizard.cpp b/mythtv/libs/libmyth/schemawizard.cpp
@@ -169,7 +169,7 @@ int SchemaUpgradeWizard::CompareAndWait(const int seconds)
             Compare();
             unlockSchema(query);
 
-            if (m_expertMode)  // Experts don't like to wait around :-)
+            if (m_expertMode)
                 break;
         }
 
@@ -413,13 +413,13 @@ SchemaUpgradeWizard::PromptForUpgrade(const char *name,
             return MYTH_SCHEMA_ERROR;
         }
 
-        if (m_expertMode)
-            return MYTH_SCHEMA_USE_EXISTING;
-
         returnValue = GuiPrompt(message, upgradable, m_expertMode);
         if (returnValue == MYTH_SCHEMA_EXIT)
             return MYTH_SCHEMA_EXIT;
 
+        if (m_expertMode)
+            return returnValue;
+
         // The annoying extra confirmation:
         if (backupStatus == kDB_Backup_Completed)
         {

diff --git a/mythtv/libs/libmythtv/dbcheck.cpp b/mythtv/libs/libmythtv/dbcheck.cpp
@@ -451,6 +451,9 @@ static bool performActualUpdate(
 bool UpgradeTVDatabaseSchema(const bool upgradeAllowed,
                              const bool upgradeIfNoUI)
 {
+#if IGNORE_SCHEMA_VER_MISMATCH
+    return true;
+#endif
     SchemaUpgradeWizard  * DBup;