docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plugins: fix name handling for legacy plugins 

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 8ba17b4823f9a1a40a405905613667d97bb24546)
This commit is contained in:
Tibor Vass 2016-06-17 12:02:05 -07:00
parent 6eaac7be89
commit 70bd46293a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugin/manager.go
View File

@ -204,7 +204,8 @@ func LookupWithCapability(name, capability string) (Plugin, error) {
) )
handleLegacy := true handleLegacy := true
if manager != nil { if manager != nil {
if named, err := reference.ParseNamed(name); err == nil { // FIXME: validate fullName := name
if named, err := reference.ParseNamed(fullName); err == nil { // FIXME: validate
if reference.IsNameOnly(named) { if reference.IsNameOnly(named) {
named = reference.WithDefaultTag(named) named = reference.WithDefaultTag(named)
} }
@ -212,9 +213,9 @@ func LookupWithCapability(name, capability string) (Plugin, error) {
if !ok { if !ok {
return nil, fmt.Errorf("invalid name: %s", named.String()) return nil, fmt.Errorf("invalid name: %s", named.String())
} }
name = ref.String() fullName = ref.String()
} }
p, err = manager.get(name) p, err = manager.get(fullName)
if err != nil { if err != nil {
if _, ok := err.(ErrNotFound); !ok { if _, ok := err.(ErrNotFound); !ok {
return nil, err return nil, err