diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-06 10:15:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-06 10:15:04 +0200 |
| commit | 80a2317ca20b0e5e1cd064a8962beed642be3a36 (patch) | |
| tree | 0730915a611542bf028d5b9c66ace1390a6c036f /pkg/util | |
| parent | f584d47a9d0c050c3b39793a73b0aba17b45e8ba (diff) | |
| parent | d4aa89bb40b3a2c1730c9bff31a681007a3feb97 (diff) | |
| download | podman-80a2317ca20b0e5e1cd064a8962beed642be3a36.tar.gz podman-80a2317ca20b0e5e1cd064a8962beed642be3a36.tar.bz2 podman-80a2317ca20b0e5e1cd064a8962beed642be3a36.zip | |
Merge pull request #7929 from kolyshkin/nits-err
Nits
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) { |