mirror of
https://github.com/containers/skopeo.git
synced 2025-06-27 07:07:31 +00:00
Merge pull request #1162 from containers/dependabot/go_modules/github.com/containers/common-0.33.1
Bump github.com/containers/common from 0.33.0 to 0.33.1
This commit is contained in:
commit
ef6f46a3b5
2
go.mod
2
go.mod
@ -3,7 +3,7 @@ module github.com/containers/skopeo
|
||||
go 1.12
|
||||
|
||||
require (
|
||||
github.com/containers/common v0.33.0
|
||||
github.com/containers/common v0.33.1
|
||||
github.com/containers/image/v5 v5.9.0
|
||||
github.com/containers/ocicrypt v1.0.3
|
||||
github.com/containers/storage v1.24.5
|
||||
|
4
go.sum
4
go.sum
@ -65,8 +65,8 @@ github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv
|
||||
github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
|
||||
github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
|
||||
github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
|
||||
github.com/containers/common v0.33.0 h1:7Z6aAQ2s2iniEXd/IoGgc0ukmgmzAE8Oa929t6huVB8=
|
||||
github.com/containers/common v0.33.0/go.mod h1:mjDo/NKeweL/onaspLhZ38WnHXaYmrELHclIdvSnYpY=
|
||||
github.com/containers/common v0.33.1 h1:XpDiq8Cta8+u1s4kpYSEWdB140ZmqgyIXfWkLqKx3z0=
|
||||
github.com/containers/common v0.33.1/go.mod h1:mjDo/NKeweL/onaspLhZ38WnHXaYmrELHclIdvSnYpY=
|
||||
github.com/containers/image/v5 v5.9.0 h1:dRmUtcluQcmasNo3DpnRoZjfU0rOu1qZeL6wlDJr10Q=
|
||||
github.com/containers/image/v5 v5.9.0/go.mod h1:blOEFd/iFdeyh891ByhCVUc+xAcaI3gBegXECwz9UbQ=
|
||||
github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b h1:Q8ePgVfHDplZ7U33NwHZkrVELsZP5fYj9pM5WBZB2GE=
|
||||
|
6
vendor/github.com/containers/common/pkg/retry/retry.go
generated
vendored
6
vendor/github.com/containers/common/pkg/retry/retry.go
generated
vendored
@ -69,7 +69,7 @@ func isRetryable(err error) bool {
|
||||
}
|
||||
return isRetryable(e.Err)
|
||||
case syscall.Errno:
|
||||
return shouldRestart(e)
|
||||
return isErrnoRetryable(e)
|
||||
case errcode.Errors:
|
||||
// if this error is a group of errors, process them all in turn
|
||||
for i := range e {
|
||||
@ -94,10 +94,10 @@ func isRetryable(err error) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func shouldRestart(e error) bool {
|
||||
func isErrnoRetryable(e error) bool {
|
||||
switch e {
|
||||
case syscall.ECONNREFUSED, syscall.EINTR, syscall.EAGAIN, syscall.EBUSY, syscall.ENETDOWN, syscall.ENETUNREACH, syscall.ENETRESET, syscall.ECONNABORTED, syscall.ECONNRESET, syscall.ETIMEDOUT, syscall.EHOSTDOWN, syscall.EHOSTUNREACH:
|
||||
return true
|
||||
}
|
||||
return shouldRestartPlatform(e)
|
||||
return isErrnoERESTART(e)
|
||||
}
|
||||
|
2
vendor/github.com/containers/common/pkg/retry/retry_linux.go
generated
vendored
2
vendor/github.com/containers/common/pkg/retry/retry_linux.go
generated
vendored
@ -4,6 +4,6 @@ import (
|
||||
"syscall"
|
||||
)
|
||||
|
||||
func shouldRestartPlatform(e error) bool {
|
||||
func isErrnoERESTART(e error) bool {
|
||||
return e == syscall.ERESTART
|
||||
}
|
||||
|
2
vendor/github.com/containers/common/pkg/retry/retry_unsupported.go
generated
vendored
2
vendor/github.com/containers/common/pkg/retry/retry_unsupported.go
generated
vendored
@ -2,6 +2,6 @@
|
||||
|
||||
package retry
|
||||
|
||||
func shouldRestartPlatform(e error) bool {
|
||||
func isErrnoERESTART(e error) bool {
|
||||
return false
|
||||
}
|
||||
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -39,7 +39,7 @@ github.com/containerd/cgroups/stats/v1
|
||||
github.com/containerd/containerd/errdefs
|
||||
github.com/containerd/containerd/log
|
||||
github.com/containerd/containerd/platforms
|
||||
# github.com/containers/common v0.33.0
|
||||
# github.com/containers/common v0.33.1
|
||||
github.com/containers/common/pkg/auth
|
||||
github.com/containers/common/pkg/capabilities
|
||||
github.com/containers/common/pkg/completion
|
||||
|
Loading…
Reference in New Issue
Block a user