diff options
| author | Kir Kolyshkin <kolyshkin@gmail.com> | 2020-10-05 12:33:53 -0700 |
|---|---|---|
| committer | Kir Kolyshkin <kolyshkin@gmail.com> | 2020-10-05 15:30:37 -0700 |
| commit | 4878dff3e2c89382699c29c10dc5036367275575 (patch) | |
| tree | 5215fd4238ac12dc81af595d1ee3b174430769c5 /pkg/util | |
| parent | 1b16fcfd14b9e761849e53ac2b83c964ad8ac5a9 (diff) | |
| download | podman-4878dff3e2c89382699c29c10dc5036367275575.tar.gz podman-4878dff3e2c89382699c29c10dc5036367275575.tar.bz2 podman-4878dff3e2c89382699c29c10dc5036367275575.zip | |
Remove excessive error wrapping
In case os.Open[File], os.Mkdir[All], ioutil.ReadFile and the like
fails, the error message already contains the file name and the
operation that fails, so there is no need to wrap the error with
something like "open %s failed".
While at it
- replace a few places with os.Open, ioutil.ReadAll with
ioutil.ReadFile.
- replace errors.Wrapf with errors.Wrap for cases where there
are no %-style arguments.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Diffstat (limited to 'pkg/util')
| -rw-r--r-- | pkg/util/utils.go | 4 | ||||
| -rw-r--r-- | pkg/util/utils_supported.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 7612d3012..c3a70e2fb 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -490,14 +490,14 @@ func WriteStorageConfigFile(storageOpts *storage.StoreOptions, storageConf strin } storageFile, err := os.OpenFile(storageConf, os.O_RDWR|os.O_TRUNC, 0600) if err != nil { - return errors.Wrapf(err, "cannot open %s", storageConf) + return err } tomlConfiguration := getTomlStorage(storageOpts) defer errorhandling.CloseQuiet(storageFile) enc := toml.NewEncoder(storageFile) if err := enc.Encode(tomlConfiguration); err != nil { if err := os.Remove(storageConf); err != nil { - logrus.Errorf("unable to remove file %s", storageConf) + logrus.Error(err) } return err } diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go index d627208d8..e08fd6dda 100644 --- a/pkg/util/utils_supported.go +++ b/pkg/util/utils_supported.go @@ -30,7 +30,7 @@ func GetRuntimeDir() (string, error) { if runtimeDir == "" { tmpDir := filepath.Join("/run", "user", uid) if err := os.MkdirAll(tmpDir, 0700); err != nil { - logrus.Debugf("unable to make temp dir %s", tmpDir) + logrus.Debug(err) } st, err := os.Stat(tmpDir) if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Geteuid() && (st.Mode().Perm()&0700 == 0700) { @@ -40,7 +40,7 @@ func GetRuntimeDir() (string, error) { if runtimeDir == "" { tmpDir := filepath.Join(os.TempDir(), fmt.Sprintf("run-%s", uid)) if err := os.MkdirAll(tmpDir, 0700); err != nil { - logrus.Debugf("unable to make temp dir %s", tmpDir) + logrus.Debug(err) } st, err := os.Stat(tmpDir) if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Geteuid() && (st.Mode().Perm()&0700 == 0700) { |