diff options
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal_linux.go | 12 | ||||
| -rw-r--r-- | libpod/image/image.go | 2 | ||||
| -rw-r--r-- | libpod/oci_conmon_linux.go | 4 | ||||
| -rw-r--r-- | libpod/runtime.go | 2 | ||||
| -rw-r--r-- | libpod/runtime_ctr.go | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 2f107446f..894982973 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -919,7 +919,7 @@ func (c *Container) checkpoint(ctx context.Context, options ContainerCheckpointO func (c *Container) importCheckpoint(input string) error { archiveFile, err := os.Open(input) if err != nil { - return errors.Wrap(err, "Failed to open checkpoint archive for import") + return errors.Wrap(err, "failed to open checkpoint archive for import") } defer archiveFile.Close() @@ -1116,11 +1116,11 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti // Only do this if a rootfs-diff.tar actually exists rootfsDiffFile, err := os.Open(rootfsDiffPath) if err != nil { - return errors.Wrap(err, "Failed to open root file-system diff file") + return errors.Wrap(err, "failed to open root file-system diff file") } defer rootfsDiffFile.Close() if err := c.runtime.ApplyDiffTarStream(c.ID(), rootfsDiffFile); err != nil { - return errors.Wrapf(err, "Failed to apply root file-system diff file %s", rootfsDiffPath) + return errors.Wrapf(err, "failed to apply root file-system diff file %s", rootfsDiffPath) } } deletedFilesPath := filepath.Join(c.bundlePath(), "deleted.files") @@ -1128,17 +1128,17 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti var deletedFiles []string deletedFilesJSON, err := ioutil.ReadFile(deletedFilesPath) if err != nil { - return errors.Wrapf(err, "Failed to read deleted files file") + return errors.Wrapf(err, "failed to read deleted files file") } if err := json.Unmarshal(deletedFilesJSON, &deletedFiles); err != nil { - return errors.Wrapf(err, "Failed to read deleted files file %s", deletedFilesPath) + return errors.Wrapf(err, "failed to read deleted files file %s", deletedFilesPath) } for _, deleteFile := range deletedFiles { // Using RemoveAll as deletedFiles, which is generated from 'podman diff' // lists completely deleted directories as a single entry: 'D /root'. err = os.RemoveAll(filepath.Join(c.state.Mountpoint, deleteFile)) if err != nil { - return errors.Wrapf(err, "Failed to delete file %s from container %s during restore", deletedFilesPath, c.ID()) + return errors.Wrapf(err, "failed to delete file %s from container %s during restore", deletedFilesPath, c.ID()) } } } diff --git a/libpod/image/image.go b/libpod/image/image.go index f5bf47694..0900944eb 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -867,7 +867,7 @@ func (i *Image) PushImageToReference(ctx context.Context, dest types.ImageRefere // Copy the image to the remote destination manifestBytes, err := cp.Image(ctx, policyContext, dest, src, copyOptions) if err != nil { - return errors.Wrapf(err, "Error copying image to the remote destination") + return errors.Wrapf(err, "error copying image to the remote destination") } digest, err := manifest.Digest(manifestBytes) if err != nil { diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index d9812c7e1..b13d25e22 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1390,12 +1390,12 @@ func startCommandGivenSelinux(cmd *exec.Cmd) error { ) plabel, err = selinux.CurrentLabel() if err != nil { - return errors.Wrapf(err, "Failed to get current SELinux label") + return errors.Wrapf(err, "failed to get current SELinux label") } con, err = selinux.NewContext(plabel) if err != nil { - return errors.Wrapf(err, "Failed to get new context from SELinux label") + return errors.Wrapf(err, "failed to get new context from SELinux label") } runtime.LockOSThread() diff --git a/libpod/runtime.go b/libpod/runtime.go index 6918bd1d7..7da8b181f 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -582,7 +582,7 @@ func (r *Runtime) Shutdown(force bool) error { // attempt to shut it down if r.store != nil { if _, err := r.store.Shutdown(force); err != nil { - lastError = errors.Wrapf(err, "Error shutting down container storage") + lastError = errors.Wrapf(err, "error shutting down container storage") } } if err := r.state.Close(); err != nil { diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index ee179ff2c..abb97293f 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -620,7 +620,7 @@ func (r *Runtime) evictContainer(ctx context.Context, idOrName string, removeVol id, err := r.state.LookupContainerID(idOrName) if err != nil { - return "", errors.Wrapf(err, "Failed to find container %q in state", idOrName) + return "", errors.Wrapf(err, "failed to find container %q in state", idOrName) } // Begin by trying a normal removal. Valid containers will be removed normally. @@ -650,7 +650,7 @@ func (r *Runtime) evictContainer(ctx context.Context, idOrName string, removeVol return id, err } if !exists { - return id, errors.Wrapf(err, "Failed to find container ID %q for eviction", id) + return id, errors.Wrapf(err, "failed to find container ID %q for eviction", id) } // Re-create a container struct for removal purposes |