summaryrefslogtreecommitdiff
path: root/pkg/domain/infra/abi
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-08-24 06:00:03 -0400
committerGitHub <noreply@github.com>2022-08-24 06:00:03 -0400
commitd4e54fa9992d369596bcaf969bea8dbbcb7335ab (patch)
tree8f1d53081039b64330060d3e3e16717239206e2c /pkg/domain/infra/abi
parentbbd8b64a4247c591738f7ebbac683f48aa7351a5 (diff)
parent3bf52aa338b33de719e087e15402081568453284 (diff)
downloadpodman-d4e54fa9992d369596bcaf969bea8dbbcb7335ab.tar.gz
podman-d4e54fa9992d369596bcaf969bea8dbbcb7335ab.tar.bz2
podman-d4e54fa9992d369596bcaf969bea8dbbcb7335ab.zip
Merge pull request #15351 from marshall-lee/images-pull-simple
Simplify ImagesPull for when Quiet flag is on
Diffstat (limited to 'pkg/domain/infra/abi')
-rw-r--r--pkg/domain/infra/abi/images.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 77d1bf0db..f9839f62f 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -237,8 +237,9 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
pullOptions.Variant = options.Variant
pullOptions.SignaturePolicyPath = options.SignaturePolicy
pullOptions.InsecureSkipTLSVerify = options.SkipTLSVerify
+ pullOptions.Writer = options.Writer
- if !options.Quiet {
+ if !options.Quiet && pullOptions.Writer == nil {
pullOptions.Writer = os.Stderr
}