diff options
| author | Bryan C. Mills <bcmills@google.com> | 2019-10-24 15:17:16 -0400 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2019-10-24 20:19:06 +0000 |
| commit | 680ed10c9127a28ed9510c40d59b1ff10e688bff (patch) | |
| tree | a68c1b4866a54b495d14c221f97110610d2fb869 /src/cmd/go/internal/modfetch/coderepo.go | |
| parent | c357b363cf1027afe3296e973ea6f6613cc757ad (diff) | |
| download | go-680ed10c9127a28ed9510c40d59b1ff10e688bff.tar.gz go-680ed10c9127a28ed9510c40d59b1ff10e688bff.zip | |
cmd/go/internal/modfetch/codehost: remove invariantly-empty return value from Repo.ReadZip
Previously, codehost.Repo.ReadZip returned an 'actualSubdir' value
that was the empty string in all current implementations.
Updates #26092
Change-Id: I6708dd0f13ba88bcf1a1fb405e9d818fd6f9197e
Reviewed-on: https://go-review.googlesource.com/c/go/+/203277
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Diffstat (limited to 'src/cmd/go/internal/modfetch/coderepo.go')
| -rw-r--r-- | src/cmd/go/internal/modfetch/coderepo.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/cmd/go/internal/modfetch/coderepo.go b/src/cmd/go/internal/modfetch/coderepo.go index 588f7a8d67c..600b2e75c3e 100644 --- a/src/cmd/go/internal/modfetch/coderepo.go +++ b/src/cmd/go/internal/modfetch/coderepo.go @@ -780,19 +780,16 @@ func (r *codeRepo) Zip(dst io.Writer, version string) error { } } - rev, dir, _, err := r.findDir(version) + rev, subdir, _, err := r.findDir(version) if err != nil { return err } - dl, actualDir, err := r.code.ReadZip(rev, dir, codehost.MaxZipFile) + dl, err := r.code.ReadZip(rev, subdir, codehost.MaxZipFile) if err != nil { return err } defer dl.Close() - if actualDir != "" && !hasPathPrefix(dir, actualDir) { - return fmt.Errorf("internal error: downloading %v %v: dir=%q but actualDir=%q", r.modPath, rev, dir, actualDir) - } - subdir := strings.Trim(strings.TrimPrefix(dir, actualDir), "/") + subdir = strings.Trim(subdir, "/") // Spool to local file. f, err := ioutil.TempFile("", "go-codehost-") |