fix e2e

Signed-off-by: Billy Zha <[email protected]>

cmd/oras/internal/display/pull.go

@@ -32,9 +32,8 @@ import (
 )
 
 type pullResult struct {
-	files        []metadata.File
-	layerSkipped bool
-	filesLock    sync.Mutex
+	files     []metadata.File
+	filesLock sync.Mutex
 }
 
 // PullHandler provides display handler for pulling.
@@ -237,7 +236,7 @@ func (ph *PullHandler) PostPull(root ocispec.Descriptor) error {
 		return option.WriteMetadata(ph.template, os.Stdout, metadata.NewPull(fmt.Sprintf("%s@%s", ph.target.Path, root.Digest), ph.result.files))
 	} else if ph.needTextOutput {
 		// suggest oras copy for pulling layers without annotation
-		if ph.result.layerSkipped {
+		if ph.layerSkipped.Load() {
 			Print("Skipped pulling layers without file name in", ocispec.AnnotationTitle)
 			Print("Use 'oras copy", ph.target.RawReference, "--to-oci-layout <layout-dir>' to pull all layers.")
 		} else {

cmd/oras/root/pull.go

@@ -19,7 +19,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"sync"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/spf13/cobra"
@@ -170,22 +169,3 @@ func doPull(ctx context.Context, src oras.ReadOnlyTarget, dst oras.GraphTarget,
 	// Copy
 	return oras.Copy(ctx, src, po.Reference, dst, po.Reference, opts)
 }
-
-// generateContentKey generates a unique key for each content descriptor, using
-// its digest and name if applicable.
-func generateContentKey(desc ocispec.Descriptor) string {
-	return desc.Digest.String() + desc.Annotations[ocispec.AnnotationTitle]
-}
-
-func printOnce(printed *sync.Map, s ocispec.Descriptor, msg string, verbose bool, dst any) error {
-	if _, loaded := printed.LoadOrStore(generateContentKey(s), true); loaded {
-		return nil
-	}
-	if tracked, ok := dst.(track.GraphTarget); ok {
-		// TTY
-		return tracked.Prompt(s, msg)
-
-	}
-	// none TTY
-	return display.PrintStatus(s, msg, verbose)
-}