extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-11-28 19:34:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

zfs: ZFSListMapping fix broken logic

Browse Source
This commit is contained in:
Christian Schwarz 2017-05-06 23:45:33 +02:00
parent cb37470010
commit 44d20ac256
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zfs/mapping.go
View File

@ -21,9 +21,9 @@ func ZFSListMapping(mapping DatasetMapping) (datasets []DatasetPath, err error)
var lines [][]string var lines [][]string
lines, err = ZFSList([]string{"name"}, "-r", "-t", "filesystem,volume") lines, err = ZFSList([]string{"name"}, "-r", "-t", "filesystem,volume")
datasets = make([]DatasetPath, len(lines)) datasets = make([]DatasetPath, 0, len(lines))
for i, line := range lines { for _, line := range lines {
var path DatasetPath var path DatasetPath
if path, err = NewDatasetPath(line[0]); err != nil { if path, err = NewDatasetPath(line[0]); err != nil {
@ -31,12 +31,12 @@ func ZFSListMapping(mapping DatasetMapping) (datasets []DatasetPath, err error)
} }
_, mapErr := mapping.Map(path) _, mapErr := mapping.Map(path)
if mapErr != nil && err != NoMatchError { if mapErr != nil && mapErr != NoMatchError {
return nil, err return nil, mapErr
} }
if mapErr == nil { if mapErr == nil {
datasets[i] = path datasets = append(datasets, path)
} }
} }