michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Better error messages on extract failures

Browse Source
This commit is contained in:
Eric Reed 2013-04-14 11:41:27 -04:00
parent b2f47735cc
commit 078e813d25
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MediaBrowser.Installer/MainWindow.xaml.cs
View File

@ -449,8 +449,24 @@ namespace MediaBrowser.Installer
var backupDir = Path.Combine(RootPath, "System.old"); var backupDir = Path.Combine(RootPath, "System.old");
if (Directory.Exists(systemDir)) if (Directory.Exists(systemDir))
{ {
if (Directory.Exists(backupDir)) Directory.Delete(backupDir,true); try
Directory.Move(systemDir, backupDir); {
if (Directory.Exists(backupDir)) Directory.Delete(backupDir,true);
}
catch (Exception e)
{
throw new ApplicationException("Could not delete previous backup directory.\n\n"+e.Message);
}
try
{
Directory.Move(systemDir, backupDir);
}
catch (Exception e)
{
throw new ApplicationException("Could not move system directory to backup.\n\n"+e.Message);
}
} }
// And extract // And extract
@ -469,7 +485,7 @@ namespace MediaBrowser.Installer
} }
} }
} }
catch catch (Exception e)
{ {
if (retryCount < 3) if (retryCount < 3)
{ {
@ -480,8 +496,8 @@ namespace MediaBrowser.Installer
{ {
//Rollback //Rollback
RollBack(systemDir, backupDir); RollBack(systemDir, backupDir);
File.Delete(archive); // so we don't try again if its an update TryDelete(archive); // so we don't try again if its an update
throw; throw new ApplicationException(string.Format("Could not extract {0} to {1} after {2} attempts.\n\n{3}", archive, RootPath, retryCount, e.Message));
} }
} }
} }