TrueCloudLab/restic
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request #1241 from restic/fix-timestamp-check

Browse source 
Use .Equal() instead of == for time.Time
This commit is contained in:
Alexander Neumann 2017-09-16 14:54:26 +02:00
commit fca9a523e9
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/restic/integration_helpers_test.go
View file

@ -71,7 +71,7 @@ func sameModTime(fi1, fi2 os.FileInfo) bool {
} }
} }
return fi1.ModTime() == fi2.ModTime() return fi1.ModTime().Equal(fi2.ModTime())
} }
// directoriesEqualContents checks if both directories contain exactly the same // directoriesEqualContents checks if both directories contain exactly the same

2
internal/archiver/archiver.go
View file

@ -134,7 +134,7 @@ func (arch *Archiver) reloadFileIfChanged(node *restic.Node, file fs.File) (*res
return nil, errors.Wrap(err, "restic.Stat") return nil, errors.Wrap(err, "restic.Stat")
} }
if fi.ModTime() == node.ModTime { if fi.ModTime().Equal(node.ModTime) {
return node, nil return node, nil
} }

6
internal/restic/node.go
View file

@ -503,7 +503,7 @@ func (node *Node) IsNewer(path string, fi os.FileInfo) bool {
extendedStat, ok := toStatT(fi.Sys()) extendedStat, ok := toStatT(fi.Sys())
if !ok { if !ok {
if node.ModTime != fi.ModTime() || if !node.ModTime.Equal(fi.ModTime()) ||
node.Size != size { node.Size != size {
debug.Log("node %v is newer: timestamp or size changed", path) debug.Log("node %v is newer: timestamp or size changed", path)
return true return true
@ -513,8 +513,8 @@ func (node *Node) IsNewer(path string, fi os.FileInfo) bool {
inode := extendedStat.ino() inode := extendedStat.ino()
if node.ModTime != fi.ModTime() || if !node.ModTime.Equal(fi.ModTime()) ||
node.ChangeTime != changeTime(extendedStat) || !node.ChangeTime.Equal(changeTime(extendedStat)) ||
node.Inode != uint64(inode) || node.Inode != uint64(inode) ||
node.Size != size { node.Size != size {
debug.Log("node %v is newer: timestamp, size or inode changed", path) debug.Log("node %v is newer: timestamp, size or inode changed", path)