mirror of
https://github.com/containers/skopeo.git
synced 2025-09-22 18:37:21 +00:00
Revert the removal of buildah dependency
We currently need it to drag in recent versions of other dependencies, per https://github.com/containers/skopeo/issues/796 . I'll work to update the relevant dependencies in c/image, but that will only propagate to skopeo in the next c/image release; in the meantime, this at least undoes the downgrades. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
6
vendor/github.com/docker/distribution/registry/api/errcode/handler.go
generated
vendored
6
vendor/github.com/docker/distribution/registry/api/errcode/handler.go
generated
vendored
@@ -36,9 +36,5 @@ func ServeJSON(w http.ResponseWriter, err error) error {
|
||||
|
||||
w.WriteHeader(sc)
|
||||
|
||||
if err := json.NewEncoder(w).Encode(err); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
return json.NewEncoder(w).Encode(err)
|
||||
}
|
||||
|
Reference in New Issue
Block a user