reset pretty in handler construction

Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
oras-project · Oct 10, 2024 · 49091a2 · 49091a2
1 parent c56fdec
commit 49091a2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/cmd/oras/internal/display/content/manifest_index.go b/cmd/oras/internal/display/content/manifest_index.go
@@ -46,6 +46,10 @@ func (h *manifestIndexCreate) OnContentCreated(manifest []byte) error {
 
 // NewManifestIndexCreateHandler creates a new handler.
 func NewManifestIndexCreateHandler(out io.Writer, pretty bool, outputPath string) ManifestIndexCreateHandler {
+	// ignore --pretty when output to a file
+	if outputPath != "" && outputPath != "-" {
+		pretty = false
+	}
 	return &manifestIndexCreate{
 		pretty:     pretty,
 		stdout:     out,

diff --git a/cmd/oras/root/manifest/index/create.go b/cmd/oras/root/manifest/index/create.go
@@ -89,10 +89,6 @@ Example - Create an index and output the index to stdout, auto push will be disa
 			opts.RawReference = refs[0]
 			opts.extraRefs = refs[1:]
 			opts.sources = args[1:]
-			// ignore --pretty when output to a file
-			if opts.outputPath != "" && opts.outputPath != "-" {
-				opts.Pretty.Pretty = false
-			}
 			return option.Parse(cmd, &opts)
 		},
 		Aliases: []string{"pack"},

diff --git a/cmd/oras/root/manifest/index/update.go b/cmd/oras/root/manifest/index/update.go
@@ -80,10 +80,6 @@ Example - Update an index and output the index to stdout, auto push will be disa
 				return err
 			}
 			opts.RawReference = args[0]
-			// ignore --pretty when output to a file
-			if opts.outputPath != "" && opts.outputPath != "-" {
-				opts.Pretty.Pretty = false
-			}
 			for _, manifestRef := range opts.removeArguments {
 				if !contentutil.IsDigest(manifestRef) {
 					return fmt.Errorf("remove: %s is not a digest", manifestRef)