aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFélix Sipma <felix+debian@gueux.org>2016-12-19 11:38:24 +0100
committerFélix Sipma <felix+debian@gueux.org>2016-12-19 11:38:24 +0100
commitfb6c3cf716ad4b0d5c287ed05ba889d777681bdb (patch)
treeeefd9824af221581f2e0f33c4e64fb9aaf8d69b2
parent814b40e6c901ee7298984615f4f380bb5e5008f6 (diff)
New upstream version 0.3.2upstream/0.3.2
-rw-r--r--VERSION2
-rw-r--r--src/restic/archiver/archiver.go8
2 files changed, 5 insertions, 5 deletions
diff --git a/VERSION b/VERSION
index 9e11b32..d15723f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.1
+0.3.2
diff --git a/src/restic/archiver/archiver.go b/src/restic/archiver/archiver.go
index b1912f8..b579524 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)