From 3ca8dce98b1bc9a38b2e6728ecef7b884d00fe27 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Tue, 20 May 2014 20:26:44 +0200 Subject: [PATCH] Don't load files from index into suppressed state --- model/model.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/model/model.go b/model/model.go index 109f66c20..1be2ebbfa 100644 --- a/model/model.go +++ b/model/model.go @@ -369,6 +369,9 @@ func (m *Model) Request(nodeID, repo, name string, offset int64, size int) ([]by lf := r.Get(cid.LocalID, name) if lf.Suppressed || lf.Flags&protocol.FlagDeleted != 0 { + if debug { + l.Debugf("REQ(in): %s: %q / %q o=%d s=%d; invalid: %v", nodeID, repo, name, offset, size, lf) + } return nil, ErrInvalid } @@ -412,6 +415,7 @@ func (m *Model) SeedLocal(repo string, fs []protocol.FileInfo) { for i := 0; i < len(fs); i++ { lamport.Default.Tick(fs[i].Version) sfs[i] = fileFromFileInfo(fs[i]) + sfs[i].Suppressed = false // we might have saved an index with files that were suppressed; the should not be on startup } m.rmut.RLock()