diff options
| author | Justin Clark-Casey (justincc) | 2010-10-22 18:39:40 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-10-22 18:39:40 +0100 |
| commit | bb28726a8bb14aaba075d6e61317dc7be624ab15 (patch) | |
| tree | 2ebcd7ad8ff3d20208df385a96879454e23fb0d4 /OpenSim/Region/CoreModules/World/Archiver | |
| parent | minor: add some text to the oar abort messages on assets timeout to make it c... (diff) | |
| download | opensim-SC_OLD-bb28726a8bb14aaba075d6e61317dc7be624ab15.zip opensim-SC_OLD-bb28726a8bb14aaba075d6e61317dc7be624ab15.tar.gz opensim-SC_OLD-bb28726a8bb14aaba075d6e61317dc7be624ab15.tar.bz2 opensim-SC_OLD-bb28726a8bb14aaba075d6e61317dc7be624ab15.tar.xz | |
write IAR control file first in the archive rather than last
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 43789af..1687d06 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
| @@ -171,7 +171,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 171 | 171 | ||
| 172 | m_log.InfoFormat("[ARCHIVER]: Creating archive file. This may take some time."); | 172 | m_log.InfoFormat("[ARCHIVER]: Creating archive file. This may take some time."); |
| 173 | 173 | ||
| 174 | // Write out control file | 174 | // Write out control file. This has to be done first so that subsequent loaders will see this file first |
| 175 | // XXX: I know this is a weak way of doing it since external non-OAR aware tar executables will not do this | ||
| 175 | archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, Create0p2ControlFile(options)); | 176 | archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, Create0p2ControlFile(options)); |
| 176 | m_log.InfoFormat("[ARCHIVER]: Added control file to archive."); | 177 | m_log.InfoFormat("[ARCHIVER]: Added control file to archive."); |
| 177 | 178 | ||