瀏覽代碼

Merge pull request #2575 from yichengq/343

version: not return err NotExist in Detect
Xiang Li 11 年之前
父節點
當前提交
f940a34e60
共有 1 個文件被更改,包括 4 次插入0 次删除
  1. 4 0
      version/version.go

+ 4 - 0
version/version.go

@@ -15,6 +15,7 @@
 package version
 package version
 
 
 import (
 import (
+	"os"
 	"path"
 	"path"
 
 
 	"github.com/coreos/etcd/pkg/fileutil"
 	"github.com/coreos/etcd/pkg/fileutil"
@@ -40,6 +41,9 @@ const (
 func DetectDataDir(dirpath string) (DataDirVersion, error) {
 func DetectDataDir(dirpath string) (DataDirVersion, error) {
 	names, err := fileutil.ReadDir(dirpath)
 	names, err := fileutil.ReadDir(dirpath)
 	if err != nil {
 	if err != nil {
+		if os.IsNotExist(err) {
+			err = nil
+		}
 		// Error reading the directory
 		// Error reading the directory
 		return DataDirUnknown, err
 		return DataDirUnknown, err
 	}
 	}