Merge pull request #11365 from miaoyq/del-a-unused-arg

Merged by openshift-bot
openshift · May 20, 2017 · b85c7e3 · b85c7e3
2 parents 2c04b90 + 26d138d
commit b85c7e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/image/importer/client.go b/pkg/image/importer/client.go
@@ -220,7 +220,7 @@ func schema2ToImage(manifest *schema2.DeserializedManifest, imageConfig []byte,
 	return image, nil
 }
 
-func schema0ToImage(dockerImage *dockerregistry.Image, id string) (*api.Image, error) {
+func schema0ToImage(dockerImage *dockerregistry.Image) (*api.Image, error) {
 	var baseImage api.DockerImage
 	if err := kapi.Scheme.Convert(&dockerImage.Image, &baseImage, nil); err != nil {
 		return nil, fmt.Errorf("could not convert image: %#v", err)

diff --git a/pkg/image/importer/importer.go b/pkg/image/importer/importer.go
@@ -632,7 +632,7 @@ func importRepositoryFromDockerV1(ctx gocontext.Context, repository *importRepos
 			continue
 		}
 		// we do not preserve manifests of legacy images
-		importDigest.Image, err = schema0ToImage(image, importDigest.Name)
+		importDigest.Image, err = schema0ToImage(image)
 		if err != nil {
 			importDigest.Err = err
 			continue
@@ -651,7 +651,7 @@ func importRepositoryFromDockerV1(ctx gocontext.Context, repository *importRepos
 			continue
 		}
 		// we do not preserve manifests of legacy images
-		importTag.Image, err = schema0ToImage(image, "")
+		importTag.Image, err = schema0ToImage(image)
 		if err != nil {
 			importTag.Err = err
 			continue