Merge pull request #3679 from kargakis/deploy-enable-triggers-flag-usage

OpenShift Bot · OpenShift Bot · commit a6e1afb20c9d · 2015-07-13T13:27:51.000-04:00
Merged by openshift-bot
diff --git a/pkg/cmd/cli/cmd/deploy.go b/pkg/cmd/cli/cmd/deploy.go
@@ -130,8 +130,11 @@ func (o DeployOptions) Validate(args []string) error {
 	if o.cancelDeploy {
 		numOptions++
 	}
+	if o.enableTriggers {
+		numOptions++
+	}
 	if numOptions > 1 {
-		return errors.New("only one of --latest, --retry, or --cancel is allowed.")
+		return errors.New("only one of --latest, --retry, --cancel, or --enable-triggers is allowed.")
 	}
 	return nil
 }
@@ -189,7 +192,7 @@ func (o DeployOptions) RunDeploy() error {
 				return o.osClient.DeploymentConfigs(namespace).Update(config)
 			},
 		}
-		t.enableTriggers(config, o.out)
+		err = t.enableTriggers(config, o.out)
 	default:
 		describer := describe.NewLatestDeploymentsDescriber(o.osClient, o.kubeClient, -1)
 		desc, err := describer.Describe(config.Namespace, config.Name)

Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,11 @@ func (o DeployOptions) Validate(args []string) error {`
`130`	`130`	`if o.cancelDeploy {`
`131`	`131`	`numOptions++`
`132`	`132`	`}`
	`133`	`+ if o.enableTriggers {`
	`134`	`+ numOptions++`
	`135`	`+ }`
`133`	`136`	`if numOptions > 1 {`
`134`		`- return errors.New("only one of --latest, --retry, or --cancel is allowed.")`
	`137`	`+ return errors.New("only one of --latest, --retry, --cancel, or --enable-triggers is allowed.")`
`135`	`138`	`}`
`136`	`139`	`return nil`
`137`	`140`	`}`
`@@ -189,7 +192,7 @@ func (o DeployOptions) RunDeploy() error {`
`189`	`192`	`return o.osClient.DeploymentConfigs(namespace).Update(config)`
`190`	`193`	`},`
`191`	`194`	`}`
`192`		`- t.enableTriggers(config, o.out)`
	`195`	`+ err = t.enableTriggers(config, o.out)`
`193`	`196`	`default:`
`194`	`197`	`describer := describe.NewLatestDeploymentsDescriber(o.osClient, o.kubeClient, -1)`
`195`	`198`	`desc, err := describer.Describe(config.Namespace, config.Name)`