github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-31 06:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Modify error messages on failures to close

Browse Source 
- Use a wrapping wording similar to c/image; it's slightly
  awkward at the start of the error message, but those should
  hopefully be rare.
- Notably, distinguish the three failure paths in (skopeo layers).

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač
2022-06-30 20:28:00 +02:00
parent f7df4a0838
commit 7abcca9313
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/skopeo/copy.go
View File

@@ -130,7 +130,7 @@ func (opts *copyOptions) run(args []string, stdout io.Writer) (retErr error) {
}
defer func() {
if err := policyContext.Destroy(); err != nil {
retErr = noteCloseFailure(retErr, "error tearing down policy context", err)
retErr = noteCloseFailure(retErr, "tearing down policy context", err)
}
}()

2
cmd/skopeo/inspect.go
View File

@@ -105,7 +105,7 @@ func (opts *inspectOptions) run(args []string, stdout io.Writer) (retErr error)
defer func() {
if err := src.Close(); err != nil {
retErr = noteCloseFailure(retErr, "could not close image", err)
retErr = noteCloseFailure(retErr, "closing image", err)
}
}()

6
cmd/skopeo/layers.go
View File

@@ -79,14 +79,14 @@ func (opts *layersOptions) run(args []string, stdout io.Writer) (retErr error) {
return err
}, opts.retryOpts); err != nil {
if closeErr := rawSource.Close(); closeErr != nil {
return errors.Wrapf(err, " (close error: %v)", closeErr)
return errors.Wrapf(err, " (closing image source: %v)", closeErr)
}
return err
}
defer func() {
if err := src.Close(); err != nil {
retErr = noteCloseFailure(retErr, "close error", err)
retErr = noteCloseFailure(retErr, "closing image", err)
}
}()
@@ -136,7 +136,7 @@ func (opts *layersOptions) run(args []string, stdout io.Writer) (retErr error) {
defer func() {
if err := dest.Close(); err != nil {
retErr = noteCloseFailure(retErr, "close error", err)
retErr = noteCloseFailure(retErr, "closing destination", err)
}
}()

2
cmd/skopeo/sync.go
View File

@@ -514,7 +514,7 @@ func (opts *syncOptions) run(args []string, stdout io.Writer) (retErr error) {
}
defer func() {
if err := policyContext.Destroy(); err != nil {
retErr = noteCloseFailure(retErr, "error tearing down policy context", err)
retErr = noteCloseFailure(retErr, "tearing down policy context", err)
}
}()