TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-10-27 12:18:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #238 from restic/fix-checks-on-bsd

Browse Source 
Refactor skipping symlink timestamp checks on *bsd and darwin
This commit is contained in:
Alexander Neumann
2015-07-21 19:47:33 +02:00
parent ac8d01ac8c 258b6a77ee
commit aeb5a694d3
4 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/restic/integration_helpers_test.go
View File

@@ -54,6 +54,22 @@ func walkDir(dir string) <-chan *dirEntry {
return ch
}
func isSymlink(fi os.FileInfo) bool {
mode := fi.Mode() & (os.ModeType | os.ModeCharDevice)
return mode == os.ModeSymlink
}
func sameModTime(fi1, fi2 os.FileInfo) bool {
switch runtime.GOOS {
case "darwin", "freebsd", "openbsd":
if isSymlink(fi1) && isSymlink(fi2) {
return true
}
}
return fi1.ModTime() == fi2.ModTime()
}
func (e *dirEntry) equals(other *dirEntry) bool {
if e.path != other.path {
fmt.Fprintf(os.Stderr, "%v: path does not match (%v != %v)\n", e.path, e.path, other.path)
@@ -65,11 +81,9 @@ func (e *dirEntry) equals(other *dirEntry) bool {
return false
}
if runtime.GOOS != "darwin" {
if e.fi.ModTime() != other.fi.ModTime() {
fmt.Fprintf(os.Stderr, "%v: ModTime does not match (%v != %v)\n", e.path, e.fi.ModTime(), other.fi.ModTime())
return false
}
if !sameModTime(e.fi, other.fi) {
fmt.Fprintf(os.Stderr, "%v: ModTime does not match (%v != %v)\n", e.path, e.fi.ModTime(), other.fi.ModTime())
return false
}
stat, _ := e.fi.Sys().(*syscall.Stat_t)