mirror/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-03-14 12:51:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Respect the quiet flag.

Browse Source 
When setting the `kpod load -q` flag, output was still going to the
screen.  This patch adds a check to not output to the terminal unless
there is an io.Writer specified, and then to write to the io.Writer.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #23
Approved by: rhatdan
This commit is contained in:
Daniel J Walsh
2017-11-07 08:53:06 -05:00
committed by Atomic Bot
parent a39ec628e7
commit df54adeaae
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libpod/runtime_img.go
View File

@@ -409,8 +409,7 @@ func getRegistriesToTry(image string, store storage.Store) ([]*pullStruct, error
}
searchRegistries, err := sysregistries.GetRegistries(&types.SystemContext{SystemRegistriesConfPath: registryConfigPath})
if err != nil {
fmt.Println(err)
return nil, errors.Errorf("unable to parse the registries.conf file and"+
return nil, errors.Wrapf(err, "unable to parse the registries.conf file and"+
" the image name '%s' is incomplete.", imageName)
}
for _, searchRegistry := range searchRegistries {
@@ -587,9 +586,13 @@ func (r *Runtime) PullImage(imgName string, options CopyOptions) error {
copyOptions := common.GetCopyOptions(options.Writer, signaturePolicyPath, &options.DockerRegistryOptions, nil, options.SigningOptions, options.AuthFile)
for _, imageInfo := range pullStructs {
fmt.Printf("Trying to pull %s...\n", imageInfo.image)
if options.Writer != nil {
io.WriteString(options.Writer, fmt.Sprintf("Trying to pull %s...\n", imageInfo.image))
}
if err = cp.Image(policyContext, imageInfo.dstRef, imageInfo.srcRef, copyOptions); err != nil {
fmt.Println("Failed")
if options.Writer != nil {
io.WriteString(options.Writer, "Failed\n")
}
} else {
return nil
}