]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go/internal/modfetch: stop cutting the last character of versions
authorRoberto Selbach <roberto@selbach.ca>
Mon, 27 Aug 2018 15:57:32 +0000 (15:57 +0000)
committerBryan C. Mills <bcmills@google.com>
Thu, 13 Sep 2018 19:36:52 +0000 (19:36 +0000)
When a zip archive for a module contains an unexpected file, the error
message removes the last character in the version number, e.g. an invalid
archive for "somemod@v1.2.3" would generate the following error:
"zip for somemod@1.2. has unexpected file..."

Change-Id: I366622df16a71fa7467a4bc62cb696e3e83a2942
GitHub-Last-Rev: f172283bcdffd45b485b1e8fd99795eb93fef726
GitHub-Pull-Request: golang/go#27279
Reviewed-on: https://go-review.googlesource.com/131635
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
src/cmd/go/internal/modfetch/fetch.go

index 2e26bac434da8d17a03c006bb770f636d1d1a397..8485932b42fca538fbfbf00c4fffc904d96bbbc8 100644 (file)
@@ -123,7 +123,7 @@ func downloadZip(mod module.Version, target string) error {
        for _, f := range z.File {
                if !strings.HasPrefix(f.Name, prefix) {
                        z.Close()
-                       return fmt.Errorf("zip for %s has unexpected file %s", prefix[:len(prefix)-1], f.Name)
+                       return fmt.Errorf("zip for %s has unexpected file %s", prefix, f.Name)
                }
        }
        z.Close()