Merge pull request containers#875 from Luap99/revert-864

Revert "pull: fix pulling from dir transport"

libimage/pull.go

@@ -243,14 +243,8 @@ func (r *Runtime) copyFromDefault(ctx context.Context, ref types.ImageReference,
 		imageName = named.String()
 
 	default:
-		// Path-based transports (e.g., dir) may include invalid
-		// characters, so we should pessimistically generate an ID
-		// instead of looking at the StringWithinTransport().
-		storageName, err = getImageID(ctx, ref, nil)
-		if err != nil {
-			return nil, err
-		}
-		imageName = "sha256:" + storageName[1:]
+		storageName = toLocalImageName(ref.StringWithinTransport())
+		imageName = storageName
 	}
 
 	// Create a storage reference.

libimage/pull_test.go

@@ -51,9 +51,6 @@ func TestPull(t *testing.T) {
 		{"docker://docker.io/library/alpine", false, 1, []string{"docker.io/library/alpine:latest"}},
 		{"quay.io/libpod/alpine@sha256:634a8f35b5f16dcf4aaa0822adc0b1964bb786fca12f6831de8ddc45e5986a00", false, 1, []string{"quay.io/libpod/alpine@sha256:634a8f35b5f16dcf4aaa0822adc0b1964bb786fca12f6831de8ddc45e5986a00"}},
 		{"quay.io/libpod/alpine:pleaseignorethistag@sha256:634a8f35b5f16dcf4aaa0822adc0b1964bb786fca12f6831de8ddc45e5986a00", false, 1, []string{"quay.io/libpod/alpine@sha256:634a8f35b5f16dcf4aaa0822adc0b1964bb786fca12f6831de8ddc45e5986a00"}},
-
-		// DIR
-		{"dir:testdata/scratch-dir-5pec!@L", false, 1, []string{"61e17f84d763cc086d43c67dcf4cdbd69f9224c74e961c53b589b70499eac443"}},
 	} {
 		pulledImages, err := runtime.Pull(ctx, test.input, config.PullPolicyAlways, pullOptions)
 		if test.expectError {