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

config: fix mapping parser

Browse Source
This commit is contained in:
Christian Schwarz 2017-04-30 17:56:11 +02:00
parent 3e0c758d7f
commit 6da2deb96e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/config.go
View File

@ -225,6 +225,7 @@ func parsePulls(v interface{}, pl poolLookup) (p []Pull, err error) {
return return
} }
} }
pull := Pull{ pull := Pull{
From: fromPool, From: fromPool,
} }
@ -280,11 +281,11 @@ func parseClientMapping(v interface{}) (s ClientMapping, err error) {
func parseComboMapping(m map[string]string) (c zfs.ComboMapping, err error) { func parseComboMapping(m map[string]string) (c zfs.ComboMapping, err error) {
c.Mappings = make([]zfs.DatasetMapping, len(m)) c.Mappings = make([]zfs.DatasetMapping, 0, len(m))
for lhs, rhs := range m { for lhs, rhs := range m {
if lhs[0] == '|' { if lhs == "|" {
if len(m) != 1 { if len(m) != 1 {
err = errors.New("non-recursive mapping must be the only mapping for a sink") err = errors.New("non-recursive mapping must be the only mapping for a sink")
@ -300,7 +301,7 @@ func parseComboMapping(m map[string]string) (c zfs.ComboMapping, err error) {
c.Mappings = append(c.Mappings, m) c.Mappings = append(c.Mappings, m)
} else if lhs[0] == '*' { } else if lhs == "*" && strings.HasPrefix(rhs, "!") {
m := zfs.ExecMapping{} m := zfs.ExecMapping{}
fields := strings.Fields(strings.TrimPrefix(rhs, "!")) fields := strings.Fields(strings.TrimPrefix(rhs, "!"))