Merge pull request #3025 from fuweid/bugfix_merge_label

crosbymichael · web-flow · commit ee916fe33cd7 · 2019-02-18T11:39:02.000-05:00
metadata: merge snapshot labels with metadata's labels
diff --git a/metadata/snapshot.go b/metadata/snapshot.go
@@ -232,7 +232,7 @@ func overlayInfo(info, overlay snapshots.Info) snapshots.Info {
 		info.Labels = overlay.Labels
 	} else {
 		for k, v := range overlay.Labels {
-			overlay.Labels[k] = v
+			info.Labels[k] = v
 		}
 	}
 	return info

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ func overlayInfo(info, overlay snapshots.Info) snapshots.Info {`
`232`	`232`	`info.Labels = overlay.Labels`
`233`	`233`	`} else {`
`234`	`234`	`for k, v := range overlay.Labels {`
`235`		`- overlay.Labels[k] = v`
	`235`	`+ info.Labels[k] = v`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`	`return info`