diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-17 17:22:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-17 17:22:37 +0000 |
| commit | a17afa931d1aa73b8657cf26de3b49841837f66d (patch) | |
| tree | 8b3e3408eea4fa15320f5c294d96b8e134bf49c4 /pkg/api | |
| parent | 033336606f8aa9687cbdff5450c691b48d45e8e6 (diff) | |
| parent | 86335aa4ae01dadecd36468409d742e68b76925d (diff) | |
| download | podman-a17afa931d1aa73b8657cf26de3b49841837f66d.tar.gz podman-a17afa931d1aa73b8657cf26de3b49841837f66d.tar.bz2 podman-a17afa931d1aa73b8657cf26de3b49841837f66d.zip | |
Merge pull request #8752 from baude/bindings3volumes
misc bindings to podman v3
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/compat/events.go | 3 | ||||
| -rw-r--r-- | pkg/api/handlers/libpod/images.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go index c75511a4d..047220906 100644 --- a/pkg/api/handlers/compat/events.go +++ b/pkg/api/handlers/compat/events.go @@ -33,6 +33,8 @@ func filtersFromRequest(r *http.Request) ([]string, error) { if _, found := r.URL.Query()["filters"]; found { raw = []byte(r.Form.Get("filters")) + } else if _, found := r.URL.Query()["Filters"]; found { + raw = []byte(r.Form.Get("Filters")) } else { return []string{}, nil } @@ -95,7 +97,6 @@ func GetEvents(w http.ResponseWriter, r *http.Request) { utils.Error(w, "failed to parse parameters", http.StatusBadRequest, errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String())) return } - eventChannel := make(chan *events.Event) errorChannel := make(chan error) diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index 814d0fd69..0b8712f16 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -286,7 +286,7 @@ func ExportImages(w http.ResponseWriter, r *http.Request) { case define.OCIManifestDir, define.V2s2ManifestDir: tmpdir, err := ioutil.TempDir("", "save") if err != nil { - utils.Error(w, "unable to create tmpdir", http.StatusInternalServerError, errors.Wrap(err, "unable to create tempdir")) + utils.Error(w, "unable to create tmpdir", http.StatusInternalServerError, errors.Wrap(err, "unable to create tmpdir")) return } output = tmpdir |