Return error directly in internal/sync/sync.go#Version

stephenwithav · stephenwithav · commit d853066ae320 · 2020-07-02T10:56:39.000-04:00
diff --git a/cmd/coder/sync.go b/cmd/coder/sync.go
@@ -99,7 +99,7 @@ func (cmd *syncCmd) Run(fl *pflag.FlagSet) {
 	if rsyncErr != nil {
 		flog.Info("Unable to determine remote rsync version.  Proceeding cautiously.")
 	} else if localVersion != remoteVersion {
-		flog.Fatal(fmt.Sprintf("rsync protocol mismatch. local is %s; remote is %s.", localVersion, remoteVersion))
+		flog.Fatal(fmt.Sprintf("rsync protocol mismatch. %s.", localVersion, rsyncErr))
 	}
 
 	for err == nil || err == sync.ErrRestartSync {
diff --git a/internal/sync/sync.go b/internal/sync/sync.go
@@ -287,11 +287,11 @@ func (s Sync) Version() (string, error) {
 	io.Copy(buf, process.Stdout())
 
 	err = process.Wait()
-	if code, ok := err.(wsep.ExitError); ok {
-		return "", fmt.Errorf("Version check exit status: %v", code)
+	if _, ok := err.(wsep.ExitError); ok {
+		return "", err
 	}
 	if err != nil {
-		return "", fmt.Errorf("Server version mismatch")
+		return "", err
 	}
 
 	firstLine, err := buf.ReadString('\n')

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ func (cmd syncCmd) Run(fl pflag.FlagSet) {`
`99`	`99`	`if rsyncErr != nil {`
`100`	`100`	`flog.Info("Unable to determine remote rsync version. Proceeding cautiously.")`
`101`	`101`	`} else if localVersion != remoteVersion {`
`102`		`- flog.Fatal(fmt.Sprintf("rsync protocol mismatch. local is %s; remote is %s.", localVersion, remoteVersion))`
	`102`	`+ flog.Fatal(fmt.Sprintf("rsync protocol mismatch. %s.", localVersion, rsyncErr))`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`for err == nil \|\| err == sync.ErrRestartSync {`
Original file line number	Diff line number	Diff line change
`@@ -287,11 +287,11 @@ func (s Sync) Version() (string, error) {`
`287`	`287`	`io.Copy(buf, process.Stdout())`
`288`	`288`
`289`	`289`	`err = process.Wait()`
`290`		`- if code, ok := err.(wsep.ExitError); ok {`
`291`		`- return "", fmt.Errorf("Version check exit status: %v", code)`
	`290`	`+ if _, ok := err.(wsep.ExitError); ok {`
	`291`	`+ return "", err`
`292`	`292`	`}`
`293`	`293`	`if err != nil {`
`294`		`- return "", fmt.Errorf("Server version mismatch")`
	`294`	`+ return "", err`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`firstLine, err := buf.ReadString('\n')`