diff options
| author | Melanie | 2010-05-19 03:07:31 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-19 03:07:31 +0100 |
| commit | 9fa8013ca5e788862a3afa8fa7a354e492d51c7e (patch) | |
| tree | c07601cae10bd6dd753f758db712c8261b64ffbe | |
| parent | Revert "Allow migration steps to fail again without bringing down the house" (diff) | |
| download | opensim-SC_OLD-9fa8013ca5e788862a3afa8fa7a354e492d51c7e.zip opensim-SC_OLD-9fa8013ca5e788862a3afa8fa7a354e492d51c7e.tar.gz opensim-SC_OLD-9fa8013ca5e788862a3afa8fa7a354e492d51c7e.tar.bz2 opensim-SC_OLD-9fa8013ca5e788862a3afa8fa7a354e492d51c7e.tar.xz | |
Remove the return that was inserted in the last merge to allow
migrations to continue in the face of an error
| -rw-r--r-- | OpenSim/Data/Migration.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs index e43d7c1..ddf8078 100644 --- a/OpenSim/Data/Migration.cs +++ b/OpenSim/Data/Migration.cs | |||
| @@ -202,7 +202,6 @@ namespace OpenSim.Data | |||
| 202 | m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", kvp.Value.ToString()); | 202 | m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", kvp.Value.ToString()); |
| 203 | m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Migration aborted.", e.Message); | 203 | m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Migration aborted.", e.Message); |
| 204 | ExecuteScript("ROLLBACK;"); | 204 | ExecuteScript("ROLLBACK;"); |
| 205 | return; | ||
| 206 | } | 205 | } |
| 207 | 206 | ||
| 208 | if (version == 0) | 207 | if (version == 0) |