浏览代码

lib/config, lib/model: Don't warn and return error (#4997)

Simon Frei 7 年之前
父节点
当前提交
1e2732aa21
共有 2 个文件被更改,包括 5 次插入10 次删除
  1. 1 3
      lib/config/folderconfiguration.go
  2. 4 7
      lib/model/model.go

+ 1 - 3
lib/config/folderconfiguration.go

@@ -190,9 +190,7 @@ func (f *FolderConfiguration) CreateRoot() (err error) {
 	filesystem := f.Filesystem()
 	filesystem := f.Filesystem()
 
 
 	if _, err = filesystem.Stat("."); fs.IsNotExist(err) {
 	if _, err = filesystem.Stat("."); fs.IsNotExist(err) {
-		if err = filesystem.MkdirAll(".", permBits); err != nil {
-			l.Warnf("Creating directory for %v: %v", f.Description(), err)
-		}
+		err = filesystem.MkdirAll(".", permBits)
 	}
 	}
 
 
 	return err
 	return err

+ 4 - 7
lib/model/model.go

@@ -231,13 +231,10 @@ func (m *Model) startFolderLocked(folder string) config.FolderType {
 		// if these things don't work, we still want to start the folder and
 		// if these things don't work, we still want to start the folder and
 		// it'll show up as errored later.
 		// it'll show up as errored later.
 
 
-		// Directory permission bits. Will be filtered down to something
-		// sane by umask on Unixes.
-
-		cfg.CreateRoot()
-
-		if err := cfg.CreateMarker(); err != nil {
-			l.Warnln("Creating folder marker:", err)
+		if err := cfg.CreateRoot(); err != nil {
+			l.Warnln("Failed to create folder root directory", err)
+		} else if err = cfg.CreateMarker(); err != nil {
+			l.Warnln("Failed to create folder marker:", err)
 		}
 		}
 	}
 	}