Merge pull request #10980 from miminar/fix-volumes-from

Fixed bad handling of "container not found" error
Upstream-commit: 478a9462e8776f60c8445972bcb3e506c6e7d413
Component: engine
This commit is contained in:
Michael Crosby
2015-02-24 13:23:34 -08:00

View File

@ -279,7 +279,7 @@ func (container *Container) applyVolumesFrom() error {
c, err := container.daemon.Get(id)
if err != nil {
return err
return fmt.Errorf("Could not apply volumes of non-existent container %q.", id)
}
var (