TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-10-21 12:39:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'replace_arrar'

Browse Source
This commit is contained in:
Alexander Neumann
2015-05-02 14:34:33 +02:00
parent 24f85528dc 97619e743c
commit 4a1cb65645
3 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
archiver.go
View File

@@ -2,7 +2,6 @@ package restic
import (
"encoding/json"
"errors"
"fmt"
"io"
"os"
@@ -10,13 +9,14 @@ import (
"sort"
"sync"
"github.com/juju/arrar"
"github.com/restic/restic/backend"
"github.com/restic/restic/chunker"
"github.com/restic/restic/debug"
"github.com/restic/restic/pack"
"github.com/restic/restic/pipe"
"github.com/restic/restic/server"
"github.com/juju/errors"
)
const (
@@ -192,7 +192,7 @@ func (arch *Archiver) SaveFile(p *Progress, node *Node) error {
}
if err != nil {
return arrar.Annotate(err, "SaveFile() chunker.Next()")
return errors.Annotate(err, "SaveFile() chunker.Next()")
}
resCh := make(chan saveResult, 1)