mirror of
				https://github.com/containers/podman.git
				synced 2025-10-31 01:50:50 +08:00 
			
		
		
		
	 2c63b8439b
			
		
	
	2c63b8439b
	
	
	
		
			
			Podman adds an Error: to every error message. So starting an error message with "error" ends up being reported to the user as Error: error ... This patch removes the stutter. Also ioutil.ReadFile errors report the Path, so wrapping the err message with the path causes a stutter. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
		
			
				
	
	
		
			47 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			47 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package compat
 | |
| 
 | |
| import (
 | |
| 	"fmt"
 | |
| 	"net/http"
 | |
| 
 | |
| 	"github.com/containers/podman/v4/libpod"
 | |
| 	"github.com/containers/podman/v4/pkg/api/handlers"
 | |
| 	"github.com/containers/podman/v4/pkg/api/handlers/utils"
 | |
| 	api "github.com/containers/podman/v4/pkg/api/types"
 | |
| )
 | |
| 
 | |
| func HistoryImage(w http.ResponseWriter, r *http.Request) {
 | |
| 	runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
 | |
| 	name := utils.GetName(r)
 | |
| 
 | |
| 	possiblyNormalizedName, err := utils.NormalizeToDockerHub(r, name)
 | |
| 	if err != nil {
 | |
| 		utils.Error(w, http.StatusInternalServerError, fmt.Errorf("normalizing image: %w", err))
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	newImage, _, err := runtime.LibimageRuntime().LookupImage(possiblyNormalizedName, nil)
 | |
| 	if err != nil {
 | |
| 		utils.ImageNotFound(w, possiblyNormalizedName, fmt.Errorf("failed to find image %s: %w", possiblyNormalizedName, err))
 | |
| 		return
 | |
| 	}
 | |
| 	history, err := newImage.History(r.Context())
 | |
| 	if err != nil {
 | |
| 		utils.InternalServerError(w, err)
 | |
| 		return
 | |
| 	}
 | |
| 	allHistory := make([]handlers.HistoryResponse, 0, len(history))
 | |
| 	for _, h := range history {
 | |
| 		l := handlers.HistoryResponse{
 | |
| 			ID:        h.ID,
 | |
| 			Created:   h.Created.Unix(),
 | |
| 			CreatedBy: h.CreatedBy,
 | |
| 			Tags:      h.Tags,
 | |
| 			Size:      h.Size,
 | |
| 			Comment:   h.Comment,
 | |
| 		}
 | |
| 		allHistory = append(allHistory, l)
 | |
| 	}
 | |
| 	utils.WriteResponse(w, http.StatusOK, allHistory)
 | |
| }
 |