diff --git a/src/cmds/restic/cmd_restore.go b/src/cmds/restic/cmd_restore.go index 9ac25bcb4..2e5253569 100644 --- a/src/cmds/restic/cmd_restore.go +++ b/src/cmds/restic/cmd_restore.go @@ -106,7 +106,7 @@ func runRestore(opts RestoreOptions, gopts GlobalOptions, args []string) error { return nil } - selectExcludeFilter := func(item string, dstpath string, node *restic.Node) bool { + selectExcludeFilter := func(item string, node *restic.Node) bool { matched, err := filter.List(opts.Exclude, item) if err != nil { Warnf("error for exclude pattern: %v", err) @@ -115,7 +115,7 @@ func runRestore(opts RestoreOptions, gopts GlobalOptions, args []string) error { return !matched } - selectIncludeFilter := func(item string, dstpath string, node *restic.Node) bool { + selectIncludeFilter := func(item string, node *restic.Node) bool { matched, err := filter.List(opts.Include, item) if err != nil { Warnf("error for include pattern: %v", err) diff --git a/src/restic/restorer.go b/src/restic/restorer.go index 5397c8d52..38be8a38a 100644 --- a/src/restic/restorer.go +++ b/src/restic/restorer.go @@ -16,7 +16,7 @@ type Restorer struct { sn *Snapshot Error func(dir string, node *Node, err error) error - SelectFilter func(item string, dstpath string, node *Node) bool + SelectFilter func(item string, node *Node) bool } var restorerAbortOnAllErrors = func(str string, node *Node, err error) error { return err } @@ -24,8 +24,9 @@ var restorerAbortOnAllErrors = func(str string, node *Node, err error) error { r // NewRestorer creates a restorer preloaded with the content from the snapshot id. func NewRestorer(repo Repository, id ID) (*Restorer, error) { r := &Restorer{ - repo: repo, Error: restorerAbortOnAllErrors, - SelectFilter: func(string, string, *Node) bool { return true }, + repo: repo, + Error: restorerAbortOnAllErrors, + SelectFilter: func(string, *Node) bool { return true }, } var err error @@ -45,8 +46,7 @@ func (res *Restorer) restoreTo(dst string, dir string, treeID ID) error { } for _, node := range tree.Nodes { - selectedForRestore := res.SelectFilter(filepath.Join(dir, node.Name), - filepath.Join(dst, dir, node.Name), node) + selectedForRestore := res.SelectFilter(filepath.Join(dir, node.Name), node) debug.Log("SelectForRestore returned %v", selectedForRestore) if selectedForRestore {