From 95567c68bfdc1c198125480bcb1e13d9d280c77f Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Thu, 20 Oct 2016 09:26:18 -0700 Subject: [PATCH] posix: Do not print errors in expected errors. (#3012) Fixes #3011 --- cmd/posix.go | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/cmd/posix.go b/cmd/posix.go index b30bfa101..db10411b1 100644 --- a/cmd/posix.go +++ b/cmd/posix.go @@ -73,22 +73,28 @@ func checkPathLength(pathName string) error { func isDirEmpty(dirname string) bool { f, err := os.Open(dirname) if err != nil { - errorIf(err, "Unable to access directory.") + errorIf(func() error { + if !os.IsNotExist(err) { + return err + } + return nil + }(), "Unable to access directory.") return false } defer f.Close() // List one entry. _, err = f.Readdirnames(1) - if err != nil { - if err == io.EOF { - // Returns true if we have reached EOF, directory is indeed empty. - return true - } - errorIf(err, "Unable to list directory.") + if err != io.EOF { + errorIf(func() error { + if !os.IsNotExist(err) { + return err + } + return nil + }(), "Unable to list directory.") return false } - // Directory is not empty. - return false + // Returns true if we have reached EOF, directory is indeed empty. + return true } // Initialize a new storage disk.