opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10259 from rhatdan/pull

Browse Source 
Report Download complete in Compatibility mode
This commit is contained in:
OpenShift Merge Robot
2021-05-07 15:06:51 -04:00
committed by GitHub
parent d3e441fda3 3757d8820d
commit 141d3f1ac3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/handlers/compat/images.go
View File

@ -324,7 +324,11 @@ loop: // break out of for/select infinite loop
flush() flush()
case <-runCtx.Done(): case <-runCtx.Done():
if !failed { if !failed {
if utils.IsLibpodRequest(r) {
report.Status = "Pull complete" report.Status = "Pull complete"
} else {
report.Status = "Download complete"
}
report.Id = img[0:12] report.Id = img[0:12]
if err := enc.Encode(report); err != nil { if err := enc.Encode(report); err != nil {
logrus.Warnf("Failed to json encode error %q", err.Error()) logrus.Warnf("Failed to json encode error %q", err.Error())