From ce86dffbfd1f965526015326e0af8799856b29fd Mon Sep 17 00:00:00 2001 From: Roman Khafizianov Date: Wed, 21 Feb 2024 16:38:08 +0100 Subject: [PATCH] filetime: fix 32bit systems # Conflicts: # go.sum --- core/block/import/common/filetime/linux.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/block/import/common/filetime/linux.go b/core/block/import/common/filetime/linux.go index 6d57a2121..6b5d62d9a 100644 --- a/core/block/import/common/filetime/linux.go +++ b/core/block/import/common/filetime/linux.go @@ -21,7 +21,7 @@ func ExtractFileTimes(fileName string) (int64, int64) { } if stat, ok := fileInfo.Sys().(*syscall.Stat_t); ok { - creationTime := time.Unix(stat.Ctim.Sec, stat.Ctim.Nsec) + creationTime := time.Unix(int64(stat.Ctim.Sec), int64(stat.Ctim.Nsec)) modTime := fileInfo.ModTime().Unix() return creationTime.Unix(), modTime } diff --git a/go.mod b/go.mod index 43bd6a0ce..8062f330d 100644 --- a/go.mod +++ b/go.mod @@ -270,7 +270,7 @@ require ( replace github.com/dgraph-io/badger/v4 => github.com/anyproto/badger/v4 v4.2.1-0.20240110160636-80743fa3d580 -replace github.com/dgraph-io/ristretto => github.com/anyproto/ristretto v0.1.2-0.20240206201651-43b6ac4c41bf +replace github.com/dgraph-io/ristretto => github.com/anyproto/ristretto v0.1.2-0.20240221153107-2b23839cc50c replace github.com/libp2p/zeroconf/v2 => github.com/anyproto/zeroconf/v2 v2.2.1-0.20230303151330-fa3ab41a4941 diff --git a/go.sum b/go.sum index e22361d7a..d1816b6f4 100644 --- a/go.sum +++ b/go.sum @@ -129,8 +129,8 @@ github.com/anyproto/html-to-markdown v0.0.0-20231025221133-830bf0a6f139 h1:Wp9z0 github.com/anyproto/html-to-markdown v0.0.0-20231025221133-830bf0a6f139/go.mod h1:1zaDDQVWTRwNksmTUTkcVXqgNF28YHiEUIm8FL9Z+II= github.com/anyproto/protobuf v1.3.3-0.20240201225420-6e325cf0ac38 h1:80jke82/c+bNQQpnx4VO3Mi/lAxARyyfUpZvFaPxdzE= github.com/anyproto/protobuf v1.3.3-0.20240201225420-6e325cf0ac38/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/anyproto/ristretto v0.1.2-0.20240206201651-43b6ac4c41bf h1:4M5223J0RSOelU4UPyaru8qEVTtdRoLwNd6ZVTPACq4= -github.com/anyproto/ristretto v0.1.2-0.20240206201651-43b6ac4c41bf/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= +github.com/anyproto/ristretto v0.1.2-0.20240221153107-2b23839cc50c h1:GicoaTUyB2mtCIl3YMrO0OzysqRT5GA4vuvDsqEkhSM= +github.com/anyproto/ristretto v0.1.2-0.20240221153107-2b23839cc50c/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= github.com/anyproto/zeroconf/v2 v2.2.1-0.20230303151330-fa3ab41a4941 h1:sXnKo0P45QWddNR4Gfh9CgbgdQXiKjry+KJjU8evoyw= github.com/anyproto/zeroconf/v2 v2.2.1-0.20230303151330-fa3ab41a4941/go.mod h1:fuJqLnUwZTshS3U/bMRJ3+ow/v9oid1n0DmyYyNO1Xs= github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0=