summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-04 16:22:48 +0200
committerGitHub <noreply@github.com>2019-08-04 16:22:48 +0200
commitd9ea4db396e3a5ee49dc505ea8f0076c2aca515d (patch)
tree4451e25c2adeec59eb5e402891e1a283edea264f
parent140e08ef64591ecbce11ba8fff94afa8e5e65eeb (diff)
parent66485c80fcff981aa7d78add25ad0eb99ea3977a (diff)
downloadpodman-d9ea4db396e3a5ee49dc505ea8f0076c2aca515d.tar.gz
podman-d9ea4db396e3a5ee49dc505ea8f0076c2aca515d.tar.bz2
podman-d9ea4db396e3a5ee49dc505ea8f0076c2aca515d.zip
Merge pull request #3717 from rhatdan/errors
Don't log errors to the screen when XDG_RUNTIME_DIR is not set
-rw-r--r--pkg/util/utils_supported.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go
index af55689a6..6449c6f85 100644
--- a/pkg/util/utils_supported.go
+++ b/pkg/util/utils_supported.go
@@ -26,7 +26,7 @@ func GetRootlessRuntimeDir() (string, error) {
if runtimeDir == "" {
tmpDir := filepath.Join("/run", "user", uid)
if err := os.MkdirAll(tmpDir, 0700); err != nil {
- logrus.Errorf("unable to make temp dir %s", tmpDir)
+ logrus.Debugf("unable to make temp dir %s", tmpDir)
}
st, err := os.Stat(tmpDir)
if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Geteuid() && st.Mode().Perm() == 0700 {
@@ -36,7 +36,7 @@ func GetRootlessRuntimeDir() (string, error) {
if runtimeDir == "" {
tmpDir := filepath.Join(os.TempDir(), fmt.Sprintf("run-%s", uid))
if err := os.MkdirAll(tmpDir, 0700); err != nil {
- logrus.Errorf("unable to make temp dir %s", tmpDir)
+ logrus.Debugf("unable to make temp dir %s", tmpDir)
}
st, err := os.Stat(tmpDir)
if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Geteuid() && st.Mode().Perm() == 0700 {