all: Make scanning ownership opt-in (#8497)
This commit is contained in:
@@ -989,7 +989,7 @@ func (f *sendReceiveFolder) renameFile(cur, source, target protocol.FileInfo, sn
|
||||
err = errModified
|
||||
default:
|
||||
var fi protocol.FileInfo
|
||||
if fi, err = scanner.CreateFileInfo(stat, target.Name, f.mtimefs); err == nil {
|
||||
if fi, err = scanner.CreateFileInfo(stat, target.Name, f.mtimefs, f.SyncOwnership); err == nil {
|
||||
if !fi.IsEquivalentOptional(curTarget, protocol.FileInfoComparison{
|
||||
ModTimeWindow: f.modTimeWindow,
|
||||
IgnorePerms: f.IgnorePerms,
|
||||
@@ -1977,7 +1977,7 @@ func (f *sendReceiveFolder) deleteDirOnDiskHandleChildren(dir string, snap *db.S
|
||||
hasReceiveOnlyChanged = true
|
||||
return nil
|
||||
}
|
||||
diskFile, err := scanner.CreateFileInfo(info, path, f.mtimefs)
|
||||
diskFile, err := scanner.CreateFileInfo(info, path, f.mtimefs, f.SyncOwnership)
|
||||
if err != nil {
|
||||
// Lets just assume the file has changed.
|
||||
scanChan <- path
|
||||
@@ -2054,7 +2054,7 @@ func (f *sendReceiveFolder) scanIfItemChanged(name string, stat fs.FileInfo, ite
|
||||
// to the database. If there's a mismatch here, there might be local
|
||||
// changes that we don't know about yet and we should scan before
|
||||
// touching the item.
|
||||
statItem, err := scanner.CreateFileInfo(stat, item.Name, f.mtimefs)
|
||||
statItem, err := scanner.CreateFileInfo(stat, item.Name, f.mtimefs, f.SyncOwnership)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "comparing item on disk to db")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user