extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-02-18 03:11:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

zfs: fix error message formatting for send args validation

Browse Source
This commit is contained in:
Christian Schwarz 2020-05-20 12:58:49 +02:00
parent 94a0fbf953
commit 728e97700f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zfs/zfs.go
View File

@ -727,13 +727,13 @@ func (a ZFSSendArgsUnvalidated) validateCorrespondsToResumeToken(ctx context.Con
if (a.From != nil) != t.HasFromGUID { // existence must be same if (a.From != nil) != t.HasFromGUID { // existence must be same
if t.HasFromGUID { if t.HasFromGUID {
return gen.fmt("resume token not expected to be incremental, but `fromguid` = %q", t.FromGUID) return gen.fmt("resume token not expected to be incremental, but `fromguid` = %v", t.FromGUID)
} else { } else {
return gen.fmt("resume token expected to be incremental, but `fromguid` not present") return gen.fmt("resume token expected to be incremental, but `fromguid` not present")
} }
} else if t.HasFromGUID { // if exists (which is same, we checked above), they must match } else if t.HasFromGUID { // if exists (which is same, we checked above), they must match
if t.FromGUID != a.From.GUID { if t.FromGUID != a.From.GUID {
return gen.fmt("resume token `fromguid` != expected: %q != %q", t.FromGUID, a.From.GUID) return gen.fmt("resume token `fromguid` != expected: %v != %v", t.FromGUID, a.From.GUID)
} }
} else { } else {
_ = struct{}{} // both empty, ok _ = struct{}{} // both empty, ok
@ -744,7 +744,7 @@ func (a ZFSSendArgsUnvalidated) validateCorrespondsToResumeToken(ctx context.Con
return gen.fmt("resume token does not have `toguid`") return gen.fmt("resume token does not have `toguid`")
} }
if t.ToGUID != a.To.GUID { // a.To != nil because Validate checks for that if t.ToGUID != a.To.GUID { // a.To != nil because Validate checks for that
return gen.fmt("resume token `toguid` != expected: %q != %q", t.ToGUID, a.To.GUID) return gen.fmt("resume token `toguid` != expected: %v != %v", t.ToGUID, a.To.GUID)
} }
if a.Encrypted.B { if a.Encrypted.B {