Merge pull request #16161 from hashicorp/jbardin/go-getter

update go-getter
This commit is contained in:
James Bardin 2017-09-29 17:24:36 -04:00 committed by GitHub
commit 4694f88896
2 changed files with 8 additions and 3 deletions

View File

@ -49,6 +49,11 @@ func SubdirGlob(dst, subDir string) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
if len(matches) == 0 {
return "", fmt.Errorf("subdir %q not found", subDir)
}
if len(matches) > 1 { if len(matches) > 1 {
return "", fmt.Errorf("subdir %q matches multiple paths", subDir) return "", fmt.Errorf("subdir %q matches multiple paths", subDir)
} }

6
vendor/vendor.json vendored
View File

@ -1366,10 +1366,10 @@
"revisionTime": "2017-02-11T01:34:15Z" "revisionTime": "2017-02-11T01:34:15Z"
}, },
{ {
"checksumSHA1": "7SY5eTKPGF0BjyByXfKhZAAqnKc=", "checksumSHA1": "9VcI9QGCShWIUIL187qRd4sxwb8=",
"path": "github.com/hashicorp/go-getter", "path": "github.com/hashicorp/go-getter",
"revision": "56c651a79a6eec93e6ef074fe9e57fefb26b8b85", "revision": "a686900cb3753aa644dc4812be91ceaf9fdd3b98",
"revisionTime": "2017-09-14T15:44:44Z", "revisionTime": "2017-09-22T19:29:48Z",
"version": "master", "version": "master",
"versionExact": "master" "versionExact": "master"
}, },