extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-05-30 14:48:57 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

zfs: remove erronous output from ForkReader

Browse Source
This commit is contained in:
Christian Schwarz 2017-05-07 20:38:30 +02:00
parent c762502f6e
commit 54778c0374
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zfs/fork_reader.go
View File

@ -43,7 +43,6 @@ func NewForkReader(command string, args ...string) (r *ForkReader, err error) {
go func() { go func() {
defer r.exitWaitGroup.Done() defer r.exitWaitGroup.Done()
os.Stderr.WriteString("waiting")
if err := cmd.Wait(); err != nil { if err := cmd.Wait(); err != nil {
os.Stderr.WriteString(err.Error()) os.Stderr.WriteString(err.Error())
r.waitErr = ZFSError{ r.waitErr = ZFSError{
@ -52,7 +51,6 @@ func NewForkReader(command string, args ...string) (r *ForkReader, err error) {
} }
return return
} }
os.Stderr.WriteString("exited")
}() }()
return return
} }

2
zfs/zfs.go
View File

@ -137,8 +137,6 @@ func ZFSRecv(fs DatasetPath, stream io.Reader, additionalArgs ...string) (err er
// Setup an unused stdout buffer. // Setup an unused stdout buffer.
// Otherwise, ZoL v0.6.5.9-1 3.16.0-4-amd64 writes the following error to stderr and exits with code 1 // Otherwise, ZoL v0.6.5.9-1 3.16.0-4-amd64 writes the following error to stderr and exits with code 1
// cannot receive new filesystem stream: invalid backup stream // cannot receive new filesystem stream: invalid backup stream
// The stdout buffer contains the following
// waitingexited
stdout := bytes.NewBuffer(make([]byte, 0, 1024)) stdout := bytes.NewBuffer(make([]byte, 0, 1024))
cmd.Stdout = stdout cmd.Stdout = stdout