kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Updates daemon's remove link method to use more verbose error output. 

Signed-off-by: Aaron Hnatiw <aaron@griddio.com>
This commit is contained in:
Aaron Hnatiw 2019-04-25 12:57:56 -04:00
parent 3cd54c28fd
commit b6d2d12e42
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/delete.go
View File

@ -54,13 +54,13 @@ func (daemon *Daemon) rmLink(container *container.Container, name string) error
} }
parent, n := path.Split(name) parent, n := path.Split(name)
if parent == "/" { if parent == "/" {
return fmt.Errorf("Conflict, cannot remove the default name of the container") return fmt.Errorf("Conflict, cannot remove the default link name of the container")
} }
parent = strings.TrimSuffix(parent, "/") parent = strings.TrimSuffix(parent, "/")
pe, err := daemon.containersReplica.Snapshot().GetID(parent) pe, err := daemon.containersReplica.Snapshot().GetID(parent)
if err != nil { if err != nil {
return fmt.Errorf("Cannot get parent %s for name %s", parent, name) return fmt.Errorf("Cannot get parent %s for link name %s", parent, name)
} }
daemon.releaseName(name) daemon.releaseName(name)