docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Code Activity

Merge pull request #32 from shykes/shykes-0.6.5-dm-plugin

Browse Source 
Merge bug fix from dotcloud/docker master
Upstream-commit: 0c38f86e5e799e71866a3ee2f876c170e71c68d0
Component: engine
This commit is contained in:
Michael Crosby
2013-11-14 16:21:19 -08:00
parent e63f1ff2a2 7ac1f80c52
commit d3e492dda3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/api.go
View File

@@ -61,7 +61,10 @@ func parseMultipartForm(r *http.Request) error {
func httpError(w http.ResponseWriter, err error) {
statusCode := http.StatusInternalServerError
if strings.HasPrefix(err.Error(), "No such") {
// FIXME: this is brittle and should not be necessary.
// If we need to differentiate between different possible error types, we should
// create appropriate error types with clearly defined meaning.
if strings.Contains(err.Error(), "No such") {
statusCode = http.StatusNotFound
} else if strings.HasPrefix(err.Error(), "Bad parameter") {
statusCode = http.StatusBadRequest