OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Comment out checks not to overwrite existing IAR/OAR files for now on "save iar/oar" since this causes problems for some backup systems. 

Needs more thought, maybe an explicit --force/--overwrite switch
Comments on http://opensimulator.org/mantis/view.php?id=6389
integration
Justin Clark-Casey (justincc) 2012-11-01 03:42:15 +00:00
parent a7d9f5598f
commit 8dfe59d7b8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
View File

@ -210,8 +210,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
Guid id, string firstName, string lastName, string invPath, string pass, string savePath, Guid id, string firstName, string lastName, string invPath, string pass, string savePath,
Dictionary<string, object> options) Dictionary<string, object> options)
{ {
if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath)) // if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath))
return false; // return false;
if (m_scenes.Count > 0) if (m_scenes.Count > 0)
{ {

6
OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
View File

@ -158,8 +158,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
else else
path = DEFAULT_OAR_BACKUP_FILENAME; path = DEFAULT_OAR_BACKUP_FILENAME;
if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, path)) // Not doing this right now as this causes some problems with auto-backup systems. Maybe a force flag is
return; // needed
// if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, path))
// return;
ArchiveRegion(path, options); ArchiveRegion(path, options);
} }