OSS
/
go-libzfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problem with from snapshot name interpretation on incremental syncs

This commit is contained in:
Faruk Kasumovic 2018-08-15 20:23:12 +02:00
parent 159184017a
commit bcd0988597
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sendrecv.go
View File

@ -101,15 +101,20 @@ func (d *Dataset) send(FromName string, outf *os.File, flags *SendFlags) (err er
if dpath, err = d.Path(); err != nil { if dpath, err = d.Path(); err != nil {
return return
} }
sendparams := strings.Split(dpath, "@")
parent := sendparams[0]
if len(FromName) > 0 { if len(FromName) > 0 {
if FromName[0] == '#' || FromName[0] == '@' { if FromName[0] == '@' {
FromName = dpath + FromName FromName = FromName[1:]
} else if strings.Contains(FromName, "/") {
from := strings.Split(FromName, "@")
if len(from) > 0 {
FromName = from[1]
}
} }
cfromname = C.CString(FromName) cfromname = C.CString(FromName)
defer C.free(unsafe.Pointer(cfromname)) defer C.free(unsafe.Pointer(cfromname))
} }
sendparams := strings.Split(dpath, "@")
parent := sendparams[0]
ctoname = C.CString(sendparams[1]) ctoname = C.CString(sendparams[1])
defer C.free(unsafe.Pointer(ctoname)) defer C.free(unsafe.Pointer(ctoname))
if pd, err = DatasetOpen(parent); err != nil { if pd, err = DatasetOpen(parent); err != nil {
@ -200,7 +205,7 @@ func (d *Dataset) SendFrom(FromName string, outf *os.File, flags SendFlags) (err
return return
} }
} }
err = d.send(from[1], outf, &flags) err = d.send("@"+from[1], outf, &flags)
return return
} }