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

Merge pull request #591 from dotcloud/590_error_message-fix

Browse Source 
Fix error message in export
Upstream-commit: 02d255457ae96cb8dca38c82317c9760b41c11e5
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-05-13 10:58:05 -07:00
parent a38dbce240 5f800aea13
commit b6bfefb151
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/api.go
View File

@@ -117,7 +117,7 @@ func getContainersExport(srv *Server, w http.ResponseWriter, r *http.Request, va
if err := srv.ContainerExport(name, w); err != nil {
Debugf("%s", err.Error())
//return nil, err
return err
}
return nil
}

8
components/engine/commands.go
View File

@@ -1196,6 +1196,14 @@ func stream(method, path string) error {
return err
}
defer resp.Body.Close()
if resp.StatusCode < 200 || resp.StatusCode >= 400 {
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return err
}
return fmt.Errorf("error: %s", body)
}
if _, err := io.Copy(os.Stdout, resp.Body); err != nil {
return err
}