Merge pull request #22791 from smarterclayton/correct_metadata_precedence

openshift-merge-robot · web-flow · commit 90b79ec8eee1 · 2019-05-07T21:32:37.000+02:00
The new release command incorrectly detected user metadata
diff --git a/pkg/oc/cli/admin/release/new.go b/pkg/oc/cli/admin/release/new.go
@@ -351,10 +351,10 @@ func (o *NewOptions) Run() error {
 		}
 	}
 
-	hasMetadataOverrides := len(o.Name) > 0 &&
-		len(o.ReleaseMetadata) > 0 &&
-		len(o.PreviousVersions) > 0 &&
-		len(o.ToImageBase) > 0 &&
+	hasMetadataOverrides := len(o.Name) > 0 ||
+		len(o.ReleaseMetadata) > 0 ||
+		len(o.PreviousVersions) > 0 ||
+		len(o.ToImageBase) > 0 ||
 		len(o.ExtraComponentVersions) > 0
 
 	exclude := sets.NewString()

Original file line number	Diff line number	Diff line change
`@@ -351,10 +351,10 @@ func (o *NewOptions) Run() error {`
`351`	`351`	`}`
`352`	`352`	`}`
`353`	`353`
`354`		`- hasMetadataOverrides := len(o.Name) > 0 &&`
`355`		`- len(o.ReleaseMetadata) > 0 &&`
`356`		`- len(o.PreviousVersions) > 0 &&`
`357`		`- len(o.ToImageBase) > 0 &&`
	`354`	`+ hasMetadataOverrides := len(o.Name) > 0 \|\|`
	`355`	`+ len(o.ReleaseMetadata) > 0 \|\|`
	`356`	`+ len(o.PreviousVersions) > 0 \|\|`
	`357`	`+ len(o.ToImageBase) > 0 \|\|`
`358`	`358`	`len(o.ExtraComponentVersions) > 0`
`359`	`359`
`360`	`360`	`exclude := sets.NewString()`