Merge pull request #102 from dvonthenen/bug/rheloutputdiff

David vonThenen · web-flow · commit 58cc2d8c76b2 · 2016-11-07T13:06:59.000-08:00
Behavior difference between golang command output... this generates a…
diff --git a/scaleio-executor/executor/pkgmgr/mgr/rexrayProcedural.go b/scaleio-executor/executor/pkgmgr/mgr/rexrayProcedural.go
@@ -411,14 +411,15 @@ scaleio:
 		log.Infoln(types.RexRayPackageName, "is already installed")
 	}
 
-	if rrInst == "" && rrInstErr == nil {
-		log.Debugln("No previous install of", types.RexRayPackageName,
+	if rrInst == "" {
+		log.Infoln("No previous install of", types.RexRayPackageName,
 			"exists. Reboot required!")
 		log.Infoln("RexraySetup LEAVE")
 		return true, nil
 	}
 
-	log.Infoln("RexraySetup Succeeded")
+	log.Infoln("Previous install of", types.RexRayPackageName,
+		"exists. No reboot required.")
 	log.Infoln("RexraySetup LEAVE")
 	return false, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -411,14 +411,15 @@ scaleio:`
`411`	`411`	`log.Infoln(types.RexRayPackageName, "is already installed")`
`412`	`412`	`}`
`413`	`413`
`414`		`- if rrInst == "" && rrInstErr == nil {`
`415`		`- log.Debugln("No previous install of", types.RexRayPackageName,`
	`414`	`+ if rrInst == "" {`
	`415`	`+ log.Infoln("No previous install of", types.RexRayPackageName,`
`416`	`416`	`"exists. Reboot required!")`
`417`	`417`	`log.Infoln("RexraySetup LEAVE")`
`418`	`418`	`return true, nil`
`419`	`419`	`}`
`420`	`420`
`421`		`- log.Infoln("RexraySetup Succeeded")`
	`421`	`+ log.Infoln("Previous install of", types.RexRayPackageName,`
	`422`	`+ "exists. No reboot required.")`
`422`	`423`	`log.Infoln("RexraySetup LEAVE")`
`423`	`424`	`return false, nil`
`424`	`425`	`}`