diff options
author | Simon Frei <freisim93@gmail.com> | 2022-11-08 08:36:41 +0100 |
---|---|---|
committer | Simon Frei <freisim93@gmail.com> | 2022-11-08 18:04:16 +0100 |
commit | 15c0afec055b935870b05af4483a0598d2e84dbb (patch) | |
tree | e26335b055d77b64dd63de7589fa3477e09aa322 | |
parent | abb921acbc21191f18ac4a6884f5296acb216e86 (diff) |
lib/protocol: Ignore inode time when xattr&ownership is ignored (fixes #8654) (#8655)android-hotfix
lib/protocol: Ignore inode time when both xattr and ownership is ignored (fixes #8654)
-rw-r--r-- | lib/protocol/bep_extensions.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/protocol/bep_extensions.go b/lib/protocol/bep_extensions.go index 3d3eb437c3..2290f2cce9 100644 --- a/lib/protocol/bep_extensions.go +++ b/lib/protocol/bep_extensions.go @@ -244,9 +244,9 @@ func (f FileInfo) isEquivalent(other FileInfo, comp FileInfoComparison) bool { return false } - // If we are recording inode change times and it changed, they are not - // equal. - if (f.InodeChangeNs != 0 && other.InodeChangeNs != 0) && f.InodeChangeNs != other.InodeChangeNs { + // If we care about either ownership or xattrs, are recording inode change + // times and it changed, they are not equal. + if !(comp.IgnoreOwnership && comp.IgnoreXattrs) && f.InodeChangeNs != 0 && other.InodeChangeNs != 0 && f.InodeChangeNs != other.InodeChangeNs { return false } |