summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2015-09-06 17:11:51 +0200
committerJakob Borg <jakob@nym.se>2015-09-06 17:13:33 +0200
commit4b5c44b61c9b8b90ec9413b7cb461019a261a50d (patch)
tree77f65cc730b735b377378883cf2385d0a61ac283
parent41c131d840ffcb5eb26f930ce73d7185aa54d963 (diff)
Only check pull file size if check is enabled (ref #2241)
-rw-r--r--lib/model/rwfolder.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/model/rwfolder.go b/lib/model/rwfolder.go
index c0827bb2a..5c691f9f9 100644
--- a/lib/model/rwfolder.go
+++ b/lib/model/rwfolder.go
@@ -511,7 +511,7 @@ func (p *rwFolder) pullerIteration(ignores *ignore.Matcher) int {
// Check if we are able to store all files on disk. Only perform this
// check if there is a minimum free space threshold set on the folder.
folderCfg := p.model.cfg.Folders()[p.folder]
- if folderCfg.MinDiskFreePct > 0 || pullFileSize > 0 {
+ if folderCfg.MinDiskFreePct > 0 && pullFileSize > 0 {
if free, err := osutil.DiskFreeBytes(folderCfg.Path()); err == nil && free < pullFileSize {
l.Warnf(`Folder "%s": insufficient disk space available to pull %d files (%.2f MiB)`, p.folder, changed, float64(pullFileSize)/1024/1024)
return 0