From 9885aeac3bd2554fc8e49edc34513f8ee0c20f48 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 14 Dec 2016 18:56:11 +0100 Subject: [PATCH] Make sure SaveFile always returns a node --- src/restic/archiver/archiver.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/restic/archiver/archiver.go b/src/restic/archiver/archiver.go index b1912f806..b5795241b 100644 --- a/src/restic/archiver/archiver.go +++ b/src/restic/archiver/archiver.go @@ -210,14 +210,14 @@ func (arch *Archiver) SaveFile(p *restic.Progress, node *restic.Node) (*restic.N file, err := fs.Open(node.Path) defer file.Close() if err != nil { - return nil, errors.Wrap(err, "Open") + return node, errors.Wrap(err, "Open") } debug.RunHook("archiver.SaveFile", node.Path) node, err = arch.reloadFileIfChanged(node, file) if err != nil { - return nil, err + return node, err } chnker := chunker.New(file, arch.repo.Config().ChunkerPolynomial) @@ -230,7 +230,7 @@ func (arch *Archiver) SaveFile(p *restic.Progress, node *restic.Node) (*restic.N } if err != nil { - return nil, errors.Wrap(err, "chunker.Next") + return node, errors.Wrap(err, "chunker.Next") } resCh := make(chan saveResult, 1) @@ -240,7 +240,7 @@ func (arch *Archiver) SaveFile(p *restic.Progress, node *restic.Node) (*restic.N results, err := waitForResults(resultChannels) if err != nil { - return nil, err + return node, err } err = updateNodeContent(node, results)