Merge pull request #141 from fw42/fix_off_by_one

Fix progress off-by-1
This commit is contained in:
Alexander Neumann 2015-04-26 11:59:06 +02:00
commit 503c122d29
1 changed files with 4 additions and 2 deletions

View File

@ -515,7 +515,7 @@ func (arch *Archiver) dirWorker(wg *sync.WaitGroup, p *Progress, done <-chan str
// if this is the top-level dir, only create a stub node
node = &Node{}
} else {
// else create note from path and fi
// else create node from path and fi
node, err = NodeFromFileInfo(dir.Path(), dir.Info())
if err != nil {
node.Error = err.Error()
@ -534,7 +534,9 @@ func (arch *Archiver) dirWorker(wg *sync.WaitGroup, p *Progress, done <-chan str
node.blobs = Blobs{blob}
dir.Result() <- node
p.Report(Stat{Dirs: 1})
if dir.Path() != "" {
p.Report(Stat{Dirs: 1})
}
case <-done:
// pipeline was cancelled
return