Merge pull request #14019 from mfojtik/fix-cancel-suggestion

OpenShift Bot · web-flow · commit 009cbeff7060 · 2017-05-05T00:46:50.000-05:00
Merged by openshift-bot
diff --git a/pkg/cmd/cli/cmd/deploy.go b/pkg/cmd/cli/cmd/deploy.go
@@ -245,7 +245,7 @@ func (o DeployOptions) deploy(config *deployapi.DeploymentConfig) error {
 	if err == nil && !deployutil.IsTerminatedDeployment(deployment) {
 		// Reject attempts to start a concurrent deployment.
 		return fmt.Errorf("#%d is already in progress (%s).\nOptionally, you can cancel this deployment using 'oc rollout cancel dc/%s'.",
-			config.Status.LatestVersion, deployutil.DeploymentStatusFor(deployment), deployment.Name)
+			config.Status.LatestVersion, deployutil.DeploymentStatusFor(deployment), config.Name)
 	}
 	if err != nil && !kerrors.IsNotFound(err) {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ func (o DeployOptions) deploy(config *deployapi.DeploymentConfig) error {`
`245`	`245`	`if err == nil && !deployutil.IsTerminatedDeployment(deployment) {`
`246`	`246`	`// Reject attempts to start a concurrent deployment.`
`247`	`247`	`return fmt.Errorf("#%d is already in progress (%s).\nOptionally, you can cancel this deployment using 'oc rollout cancel dc/%s'.",`
`248`		`- config.Status.LatestVersion, deployutil.DeploymentStatusFor(deployment), deployment.Name)`
	`248`	`+ config.Status.LatestVersion, deployutil.DeploymentStatusFor(deployment), config.Name)`
`249`	`249`	`}`
`250`	`250`	`if err != nil && !kerrors.IsNotFound(err) {`
`251`	`251`	`return err`