fix ignoring zfs create error messages

Author: dmke

zfs/transfer.go

@@ -2,7 +2,6 @@ package zfs
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -213,14 +212,7 @@ func DoSync(from, to *Fs, flags Flags) error {
 			// ensure the filesystem exists
 			toChild, err := to.CreateIfMissing(fromChild.name)
 			if err != nil {
-				var exitErr *exec.ExitError
-				ignore := false
-				if errors.As(err, &exitErr) {
-					ignore = canIgnoreCreateError(string(exitErr.Stderr))
-				}
-				if !ignore {
-					return err
-				}
+				return err
 			}
 			err = DoSync(fromChild, toChild, flags)
 			if err != nil {
@@ -231,8 +223,3 @@ func DoSync(from, to *Fs, flags Flags) error {
 
 	return nil
 }
-
-func canIgnoreCreateError(msg string) bool {
-	return strings.Contains(msg, "successfully created, but not mounted") ||
-		strings.Contains(msg, "filesystem successfully created, but it may only be mounted by root")
-}

zfs/zfs.go

@@ -75,9 +75,20 @@ func (z *Zfs) parseList(b []byte) *Fs {
 	return root
 }
 
+func canIgnoreCreateError(msg string) bool {
+	return strings.Contains(msg, "successfully created, but not mounted") ||
+		strings.Contains(msg, "filesystem successfully created, but it may only be mounted by root")
+}
+
 // Create creates a new filesystem by its full path.
 func (z *Zfs) Create(fs string) error {
 	_, err := z.exec("/sbin/zfs", "create", fs).Output()
+
+	var exitErr *exec.ExitError
+	if errors.As(err, &exitErr) && canIgnoreCreateError(string(exitErr.Stderr)) {
+		return nil
+	}
+
 	return err
 }