haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed error after merge with latests master

Browse Source
This commit is contained in:
Kenneth Skovhede
2016-03-30 08:33:10 +02:00
parent 317fd493d8
commit 08d8bd67a6
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Main/Operation/RepairHandler.cs
+6 -9
View File
@@ -202,18 +202,15 @@ namespace Duplicati.Library.Main.Operation
{
foreach(var rv in ifr.Volumes)
{
string cmphash;
long cmpsize;
RemoteVolumeType cmptype;
RemoteVolumeState cmpstate;
if (!db.GetRemoteVolume(rv.Filename, out cmphash, out cmpsize, out cmptype, out cmpstate))
var entry = db.GetRemoteVolume(rv.Filename);
if (entry.ID < 0)
throw new Exception(string.Format("Unknown remote file {0} detected", rv.Filename));
if (!new [] { RemoteVolumeState.Uploading, RemoteVolumeState.Uploaded, RemoteVolumeState.Verified }.Contains(cmpstate))
throw new Exception(string.Format("Volume {0} has local state {1}", rv.Filename, cmpstate));
if (!new [] { RemoteVolumeState.Uploading, RemoteVolumeState.Uploaded, RemoteVolumeState.Verified }.Contains(entry.State))
throw new Exception(string.Format("Volume {0} has local state {1}", rv.Filename, entry.State));
if (cmphash != rv.Hash || cmpsize != rv.Length || ! new [] { RemoteVolumeState.Uploading, RemoteVolumeState.Uploaded, RemoteVolumeState.Verified }.Contains(cmpstate))
throw new Exception(string.Format("Volume {0} hash/size mismatch ({1} - {2}) vs ({3} - {4})", rv.Filename, cmphash, cmpsize, rv.Hash, rv.Length));
if (entry.Hash != rv.Hash || entry.Size != rv.Length || ! new [] { RemoteVolumeState.Uploading, RemoteVolumeState.Uploaded, RemoteVolumeState.Verified }.Contains(entry.State))
throw new Exception(string.Format("Volume {0} hash/size mismatch ({1} - {2}) vs ({3} - {4})", rv.Filename, entry.Hash, entry.Size, rv.Hash, rv.Length));
db.CheckAllBlocksAreInVolume(rv.Filename, rv.Blocks);
}