Merge pull request kubernetes#12488 from pweil-/fix-conversions

a-robinson · a-robinson · commit 1e39eb07e16c · 2015-08-10T11:52:48.000-07:00
use package from out value
diff --git a/pkg/runtime/conversion_generator.go b/pkg/runtime/conversion_generator.go
@@ -195,8 +195,8 @@ func (g *conversionGenerator) generateConversionsForMap(inType, outType reflect.
 	}
 	inValue := inType.Elem()
 	outValue := outType.Elem()
-	g.addImportByPath(inKey.PkgPath())
-	g.addImportByPath(outKey.PkgPath())
+	g.addImportByPath(inValue.PkgPath())
+	g.addImportByPath(outValue.PkgPath())
 	if err := g.generateConversionsBetween(inValue, outValue); err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -195,8 +195,8 @@ func (g *conversionGenerator) generateConversionsForMap(inType, outType reflect.`
`195`	`195`	`}`
`196`	`196`	`inValue := inType.Elem()`
`197`	`197`	`outValue := outType.Elem()`
`198`		`- g.addImportByPath(inKey.PkgPath())`
`199`		`- g.addImportByPath(outKey.PkgPath())`
	`198`	`+ g.addImportByPath(inValue.PkgPath())`
	`199`	`+ g.addImportByPath(outValue.PkgPath())`
`200`	`200`	`if err := g.generateConversionsBetween(inValue, outValue); err != nil {`
`201`	`201`	`return err`
`202`	`202`	`}`