浏览代码

lib/model: Don't compare permissions if IgnorePerms is true (fixes #5323) (#5322)

Simon Frei 7 年之前
父节点
当前提交
33bed5b1ec
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      lib/model/folder_sendrecv.go

+ 2 - 2
lib/model/folder_sendrecv.go

@@ -875,7 +875,7 @@ func (f *sendReceiveFolder) renameFile(cur, source, target protocol.FileInfo, db
 		err = errModified
 		err = errModified
 	default:
 	default:
 		if fi, err := scanner.CreateFileInfo(stat, target.Name, f.fs); err == nil {
 		if fi, err := scanner.CreateFileInfo(stat, target.Name, f.fs); err == nil {
-			if !fi.IsEquivalentOptional(curTarget, false, true, protocol.LocalAllFlags) {
+			if !fi.IsEquivalentOptional(curTarget, f.IgnorePerms, true, protocol.LocalAllFlags) {
 				// Target changed
 				// Target changed
 				scanChan <- target.Name
 				scanChan <- target.Name
 				err = errModified
 				err = errModified
@@ -1880,7 +1880,7 @@ func (f *sendReceiveFolder) checkToBeDeleted(cur protocol.FileInfo, scanChan cha
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
-	if !fi.IsEquivalentOptional(cur, false, true, protocol.LocalAllFlags) {
+	if !fi.IsEquivalentOptional(cur, f.IgnorePerms, true, protocol.LocalAllFlags) {
 		// File changed
 		// File changed
 		scanChan <- cur.Name
 		scanChan <- cur.Name
 		return errModified
 		return errModified