+9
-8
@@ -601,14 +601,15 @@ func (b *scanBatch) Update(fi protocol.FileInfo, snap *db.Snapshot) bool {
|
||||
b.Remove(fi.Name)
|
||||
return true
|
||||
}
|
||||
case gf.IsEquivalentOptional(fi, protocol.FileInfoComparison{
|
||||
ModTimeWindow: b.f.modTimeWindow,
|
||||
IgnorePerms: b.f.IgnorePerms,
|
||||
IgnoreBlocks: true,
|
||||
IgnoreFlags: protocol.FlagLocalReceiveOnly,
|
||||
IgnoreOwnership: !b.f.SyncOwnership,
|
||||
IgnoreXattrs: !b.f.SyncXattrs,
|
||||
}):
|
||||
case (b.f.Type == config.FolderTypeReceiveOnly || b.f.Type == config.FolderTypeReceiveEncrypted) &&
|
||||
gf.IsEquivalentOptional(fi, protocol.FileInfoComparison{
|
||||
ModTimeWindow: b.f.modTimeWindow,
|
||||
IgnorePerms: b.f.IgnorePerms,
|
||||
IgnoreBlocks: true,
|
||||
IgnoreFlags: protocol.FlagLocalReceiveOnly,
|
||||
IgnoreOwnership: !b.f.SyncOwnership && !b.f.SendOwnership,
|
||||
IgnoreXattrs: !b.f.SyncXattrs && !b.f.SendXattrs,
|
||||
}):
|
||||
// What we have locally is equivalent to the global file.
|
||||
l.Debugf("%v scanning: Merging identical locally changed item with global", b.f, fi)
|
||||
fi = gf
|
||||
|
||||
Reference in New Issue
Block a user