Skip to content

Commit feb429e

Browse files
author
OpenShift Bot
authored
Merge pull request #12836 from bparees/newapp_wide
Merged by openshift-bot
2 parents 4ec486d + 1fc2a32 commit feb429e

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

pkg/cmd/cli/cmd/newapp.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ func (o *NewAppOptions) Complete(baseName, commandName string, f *clientcmd.Fact
216216

217217
o.Config.DryRun = o.Action.DryRun
218218

219+
if o.Action.Output == "wide" {
220+
return kcmdutil.UsageError(c, "wide mode is not a compatible output format")
221+
}
222+
219223
cmdutil.WarnAboutCommaSeparation(o.ErrOut, o.Config.Environment, "--env")
220224
cmdutil.WarnAboutCommaSeparation(o.ErrOut, o.Config.BuildEnvironment, "--build-env")
221225
cmdutil.WarnAboutCommaSeparation(o.ErrOut, o.Config.TemplateParameters, "--param")
@@ -517,7 +521,6 @@ func CompleteAppConfig(config *newcmd.AppConfig, f *clientcmd.Factory, c *cobra.
517521
if config.BinaryBuild && config.Strategy == generate.StrategyPipeline {
518522
return kcmdutil.UsageError(c, "specifying binary builds and the pipeline strategy at the same time is not allowed.")
519523
}
520-
521524
return nil
522525
}
523526

pkg/cmd/cli/cmd/newbuild.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,10 @@ func (o *NewBuildOptions) Complete(baseName, commandName string, f *clientcmd.Fa
183183
o.CommandPath = c.CommandPath()
184184
o.CommandName = commandName
185185

186+
if o.Output == "wide" {
187+
return kcmdutil.UsageError(c, "wide mode is not a compatible output format")
188+
}
189+
186190
cmdutil.WarnAboutCommaSeparation(o.ErrOut, o.Config.Environment, "--env")
187191
cmdutil.WarnAboutCommaSeparation(o.ErrOut, o.Config.BuildEnvironment, "--build-env")
188192

0 commit comments

Comments
 (0)