alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

ls: Only skip directory nodes

Browse source 
Special case for Walk(): When SkipDir is returned for a non-dir node,
the remaining nodes for the current tree are skipped. We don't want
that.
This commit is contained in:
Alexander Neumann 2018-08-12 22:02:59 +02:00
parent 7f617cfd7f
commit ace5cc4ed3
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/restic/cmd_ls.go
View file

@ -125,7 +125,15 @@ func runLs(opts LsOptions, gopts GlobalOptions, args []string) error {
}
}
if !walk {
return false, walker.SkipNode
if node.Type == "dir" {
// signal Walk() that it should not descend into the tree.
return false, walker.SkipNode
}
// we must not return SkipNode for non-dir nodes because
// then the remaining nodes in the same tree would be
// skipped, so return nil instead
return false, nil
}
// this second iteration ensures that we get an exact match