Fix bad layout options merge (google#953)

jonjohnsonjr · web-flow · commit 93228a708496 · 2021-03-02T12:43:53.000-08:00
diff --git a/pkg/v1/layout/write.go b/pkg/v1/layout/write.go
@@ -161,10 +161,9 @@ func (l Path) replaceDescriptor(append mutate.Appendable, matcher match.Matcher,
 		return err
 	}
 
-	for _, opt := range options {
-		if err := opt(desc); err != nil {
-			return err
-		}
+	o := makeOptions(options...)
+	for _, opt := range o.descOpts {
+		opt(desc)
 	}
 
 	add := mutate.IndexAddendum{

Original file line number	Diff line number	Diff line change
`@@ -161,10 +161,9 @@ func (l Path) replaceDescriptor(append mutate.Appendable, matcher match.Matcher,`
`161`	`161`	`return err`
`162`	`162`	`}`
`163`	`163`
`164`		`- for _, opt := range options {`
`165`		`- if err := opt(desc); err != nil {`
`166`		`- return err`
`167`		`- }`
	`164`	`+ o := makeOptions(options...)`
	`165`	`+ for _, opt := range o.descOpts {`
	`166`	`+ opt(desc)`
`168`	`167`	`}`
`169`	`168`
`170`	`169`	`add := mutate.IndexAddendum{`