diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-06-30 09:58:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-30 09:58:52 -0400 |
| commit | 3e8ab312395b32d0b43f1ac82adf53439b012893 (patch) | |
| tree | b8024f94b0f7446f6779c5d6e83bc6697c010387 /cmd/podman/registry/config.go | |
| parent | aa109ae0f058060466b61d01571e37b7cc718b9a (diff) | |
| parent | e8adec5f41388916b0f2206dc898a5587d51467c (diff) | |
| download | podman-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/registry/config.go')
| -rw-r--r-- | cmd/podman/registry/config.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index e06de034d..cae618b44 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -11,7 +11,6 @@ import ( "github.com/containers/podman/v4/pkg/domain/entities" "github.com/containers/podman/v4/pkg/rootless" "github.com/containers/podman/v4/pkg/util" - "github.com/pkg/errors" ) const ( @@ -99,7 +98,7 @@ func setXdgDirs() error { return err } if err := os.Setenv("XDG_RUNTIME_DIR", dir); err != nil { - return errors.Wrapf(err, "cannot set XDG_RUNTIME_DIR="+dir) + return fmt.Errorf("cannot set XDG_RUNTIME_DIR=%s: %w", dir, err) } } @@ -117,7 +116,7 @@ func setXdgDirs() error { return err } if err := os.Setenv("XDG_CONFIG_HOME", cfgHomeDir); err != nil { - return errors.Wrapf(err, "cannot set XDG_CONFIG_HOME="+cfgHomeDir) + return fmt.Errorf("cannot set XDG_CONFIG_HOME=%s: %w", cfgHomeDir, err) } } return nil |