summaryrefslogtreecommitdiff
path: root/cmd/podman/diff/diff.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2022-06-30 09:58:52 -0400
committerGitHub <noreply@github.com>2022-06-30 09:58:52 -0400
commit3e8ab312395b32d0b43f1ac82adf53439b012893 (patch)
treeb8024f94b0f7446f6779c5d6e83bc6697c010387 /cmd/podman/diff/diff.go
parentaa109ae0f058060466b61d01571e37b7cc718b9a (diff)
parente8adec5f41388916b0f2206dc898a5587d51467c (diff)
downloadpodman-3e8ab312395b32d0b43f1ac82adf53439b012893.tar.gz
podman-3e8ab312395b32d0b43f1ac82adf53439b012893.tar.bz2
podman-3e8ab312395b32d0b43f1ac82adf53439b012893.zip
Merge pull request #14785 from saschagrunert/cmd-podman-errors
cmd/podman: switch to golang native error wrapping
Diffstat (limited to 'cmd/podman/diff/diff.go')
-rw-r--r--cmd/podman/diff/diff.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/diff/diff.go b/cmd/podman/diff/diff.go
index 15c55852a..06df767d0 100644
--- a/cmd/podman/diff/diff.go
+++ b/cmd/podman/diff/diff.go
@@ -2,6 +2,7 @@ package diff
import (
"encoding/json"
+ "errors"
"fmt"
"os"
@@ -9,7 +10,6 @@ import (
"github.com/containers/podman/v4/cmd/podman/registry"
"github.com/containers/podman/v4/pkg/domain/entities"
"github.com/containers/storage/pkg/archive"
- "github.com/pkg/errors"
"github.com/spf13/cobra"
)
@@ -46,7 +46,7 @@ func changesToJSON(diffs *entities.DiffReport) error {
case archive.ChangeModify:
body.Changed = append(body.Changed, row.Path)
default:
- return errors.Errorf("output kind %q not recognized", row.Kind)
+ return fmt.Errorf("output kind %q not recognized", row.Kind)
}
}
@@ -73,7 +73,7 @@ func ValidateContainerDiffArgs(cmd *cobra.Command, args []string) error {
return errors.New("--latest and containers cannot be used together")
}
if len(args) == 0 && !given {
- return errors.Errorf("%q requires a name, id, or the \"--latest\" flag", cmd.CommandPath())
+ return fmt.Errorf("%q requires a name, id, or the \"--latest\" flag", cmd.CommandPath())
}
return nil
}