diff options
Diffstat (limited to 'libgo/go/cmd/go/internal/modfetch/sumdb.go')
| -rw-r--r-- | libgo/go/cmd/go/internal/modfetch/sumdb.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libgo/go/cmd/go/internal/modfetch/sumdb.go b/libgo/go/cmd/go/internal/modfetch/sumdb.go index 1c24ec273b5..1ed71dfb85c 100644 --- a/libgo/go/cmd/go/internal/modfetch/sumdb.go +++ b/libgo/go/cmd/go/internal/modfetch/sumdb.go @@ -24,11 +24,11 @@ import ( "cmd/go/internal/cfg" "cmd/go/internal/get" "cmd/go/internal/lockedfile" - "cmd/go/internal/module" - "cmd/go/internal/note" "cmd/go/internal/str" - "cmd/go/internal/sumweb" "cmd/go/internal/web" + "golang.org/x/mod/module" + "golang.org/x/mod/sumdb" + "golang.org/x/mod/sumdb/note" ) // useSumDB reports whether to use the Go checksum database for the given module. @@ -52,11 +52,11 @@ func lookupSumDB(mod module.Version) (dbname string, lines []string, err error) var ( dbOnce sync.Once dbName string - db *sumweb.Conn + db *sumdb.Client dbErr error ) -func dbDial() (dbName string, db *sumweb.Conn, err error) { +func dbDial() (dbName string, db *sumdb.Client, err error) { // $GOSUMDB can be "key" or "key url", // and the key can be a full verifier key // or a host on our list of known keys. @@ -106,7 +106,7 @@ func dbDial() (dbName string, db *sumweb.Conn, err error) { base = u } - return name, sumweb.NewConn(&dbClient{key: key[0], name: name, direct: direct, base: base}), nil + return name, sumdb.NewClient(&dbClient{key: key[0], name: name, direct: direct, base: base}), nil } type dbClient struct { @@ -227,7 +227,7 @@ func (*dbClient) WriteConfig(file string, old, new []byte) error { return err } if len(data) > 0 && !bytes.Equal(data, old) { - return sumweb.ErrWriteConflict + return sumdb.ErrWriteConflict } if _, err := f.Seek(0, 0); err != nil { return err |