Commit223551b

committed

Update local, remote version checks to avoid blanks.

1 parent54cecb2 commit223551bCopy full SHA for 223551b

File tree

-23

lines changed

-23

lines changed

Lines changed: 5 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
`4`		`-"bufio"`
`5`		`-"errors"`
	`4`	`+"bytes"`
`6`	`5`	`"fmt"`
`7`	`6`	`"log"`
`8`	`7`	`"os"`
`@@ -34,32 +33,18 @@ func (cmd syncCmd) RegisterFlags(fl pflag.FlagSet) {`
`34`	`33`	`fl.BoolVarP(&cmd.init,"init","i",false,"do initial transfer and exit")`
`35`	`34`	`}`
`36`	`35`
`37`		`-// See https://lxadm.com/Rsync_exit_codes#List_of_standard_rsync_exit_codes.`
`38`		`-varIncompatRsync=errors.New("rsync: exit status 2")`
`39`		`-varStreamErrRsync=errors.New("rsync: exit status 12")`
`40`		`-`
`41`	`36`	`// Returns local rsync protocol version as a string.`
`42`		`-func(s*syncCmd)version()string {`
	`37`	`+funcversion()string {`
`43`	`38`	`cmd:=exec.Command("rsync","--version")`
`44`		`-stdout,err:=cmd.StdoutPipe()`
	`39`	`+out,err:=cmd.CombinedOutput()`
`45`	`40`	`iferr!=nil {`
`46`	`41`	`log.Fatal(err)`
`47`	`42`	`}`
`48`	`43`
`49`		`-iferr:=cmd.Start();err!=nil {`
`50`		`-log.Fatal(err)`
`51`		`-}`
`52`		`-`
`53`		`-r:=bufio.NewReader(stdout)`
`54`		`-iferr:=cmd.Wait();err!=nil {`
`55`		`-log.Fatal(err)`
`56`		`-}`
`57`		`-`
`58`		`-firstLine,err:=r.ReadString('\n')`
	`44`	`+firstLine,err:=bytes.NewBuffer(out).ReadString('\n')`
`59`	`45`	`iferr!=nil {`
`60`		`-return""`
	`46`	`+log.Fatal(err)`
`61`	`47`	`}`
`62`		`-`
`63`	`48`	`versionString:=strings.Split(firstLine,"protocol version ")`
`64`	`49`
`65`	`50`	`returnversionString[1]`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package sync`
`2`	`2`
`3`	`3`	`import (`
`4`		`-"bufio"`
	`4`	`+"bytes"`
`5`	`5`	`"context"`
`6`	`6`	`"errors"`
`7`	`7`	`"fmt"`
`@@ -283,7 +283,8 @@ func (s Sync) Version() (string, error) {`
`283`	`283`	`iferr!=nil {`
`284`	`284`	`return"",err`
`285`	`285`	`}`
`286`		`-r:=bufio.NewReader(process.Stdout())`
	`286`	`+buf:=&bytes.Buffer{}`
	`287`	`+goio.Copy(buf,process.Stdout())`
`287`	`288`
`288`	`289`	`err=process.Wait()`
`289`	`290`	`ifcode,ok:=err.(wsep.ExitError);ok {`
`@@ -293,7 +294,7 @@ func (s Sync) Version() (string, error) {`
`293`	`294`	`return"",fmt.Errorf("Server version mismatch")`
`294`	`295`	`}`
`295`	`296`
`296`		`-firstLine,err:=r.ReadString('\n')`
	`297`	`+firstLine,err:=buf.ReadString('\n')`
`297`	`298`	`iferr!=nil {`
`298`	`299`	`return"",err`
`299`	`300`	`}`

Comments

(0)