From fecb6de6745c910409b2b1d685d02544b128ab62 Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Wed, 23 Oct 2019 12:08:00 -0500 Subject: [PATCH] Update umoci - minimize xattr warnings Fixes: #4662 This updates our version of umoci to v0.4.2+singularity2 from the sylabs fork. This version contains a patch to only show a warning for the first ENOTSUP error when handling xattrs on a filesystem that does not support them (e.g. NFS mount). This prevents other warnings/errors being obscured by huge numbers of unimportant ENOTSUP warnings. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 64428709d5..99096236ae 100644 --- a/go.mod +++ b/go.mod @@ -113,7 +113,7 @@ replace ( // where the patches have been merged. Dependency conflicts currently // prevent this. // For more detail see: https://github.com/sylabs/umoci/blob/singularity/README.md - github.com/openSUSE/umoci => github.com/sylabs/umoci v0.4.3-0.20191017185224-21061af9a1e7 + github.com/openSUSE/umoci => github.com/sylabs/umoci v0.4.3-0.20191023165551-c75d775ed7fd github.com/opencontainers/image-tools => github.com/sylabs/image-tools v0.0.0-20181006203805-2814f4980568 golang.org/x/crypto => github.com/sylabs/golang-x-crypto v0.0.0-20181006204705-4bce89e8e9a9 ) diff --git a/go.sum b/go.sum index 6013952bd2..84a02ae98d 100644 --- a/go.sum +++ b/go.sum @@ -312,8 +312,8 @@ github.com/sylabs/scs-library-client v0.4.4 h1:DJpXTEV1TyHe3lGQ9EJ4RzK+0ES+3rDgj github.com/sylabs/scs-library-client v0.4.4/go.mod h1:FV1aajXP99oKFFagiomGI6WkWFniKnhIq/z1mITeeb4= github.com/sylabs/sif v1.0.8 h1:BK55XU0UhUsbimCr1Sl1tCLDrFsB71EDYDcHRfPpw8k= github.com/sylabs/sif v1.0.8/go.mod h1:/W42wtEREMjfQCNz1HhqD2PHW8ZPqjiU7Z2pZQXTRqI= -github.com/sylabs/umoci v0.4.3-0.20191017185224-21061af9a1e7 h1:xrkM1WVrjk74eTmQSr9CIiV8qklNyykYn+k9zWm6faQ= -github.com/sylabs/umoci v0.4.3-0.20191017185224-21061af9a1e7/go.mod h1:8rMy7mg/N4lGwWNeoc09op5EoTcFcmmf9D+Kg8HIVKI= +github.com/sylabs/umoci v0.4.3-0.20191023165551-c75d775ed7fd h1:JZ7kZUI+IHSrK+XdTXaFgZqKJxgfUIif6XMBN8TFQCU= +github.com/sylabs/umoci v0.4.3-0.20191023165551-c75d775ed7fd/go.mod h1:8rMy7mg/N4lGwWNeoc09op5EoTcFcmmf9D+Kg8HIVKI= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 h1:b6uOv7YOFK0TYG7HtkIgExQo+2RdLuwRft63jn2HWj8= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tchap/go-patricia v2.3.0+incompatible h1:GkY4dP3cEfEASBPPkWd+AmjYxhmDkqO9/zg7R0lSQRs=