TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-08-24 22:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix integration tests

Browse Source 
Todo for later:
 * fix Futimes() syscall (will be done in #24)
 * return error in dirdiff when ModTime doesn't match
This commit is contained in:
Alexander Neumann
2014-11-16 12:05:54 +01:00
parent 53933f6705
commit ff3d0840d8
3 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
restorer.go
View File

@@ -7,6 +7,7 @@ import (
"path/filepath"
"github.com/fd0/khepri/backend"
"github.com/juju/arrar"
)
type Restorer struct {
@@ -49,7 +50,7 @@ func (res *Restorer) to(dir string, tree_id backend.ID) error {
tree := Tree{}
err := res.ch.LoadJSON(backend.Tree, tree_id, &tree)
if err != nil {
return res.Error(dir, nil, err)
return res.Error(dir, nil, arrar.Annotate(err, "LoadJSON"))
}
for _, node := range tree {
@@ -60,7 +61,7 @@ func (res *Restorer) to(dir string, tree_id backend.ID) error {
err := node.CreateAt(res.ch, p)
if err != nil {
err = res.Error(p, node, err)
err = res.Error(p, node, arrar.Annotate(err, "create node"))
if err != nil {
return err
}
@@ -73,7 +74,7 @@ func (res *Restorer) to(dir string, tree_id backend.ID) error {
err = res.to(p, node.Subtree)
if err != nil {
err = res.Error(p, node, err)
err = res.Error(p, node, arrar.Annotate(err, "restore subtree"))
if err != nil {
return err
}