mirror of
https://blitiri.com.ar/repos/chasquid
synced 2025-12-17 14:37:02 +00:00
Update protobuf library to v2
There is a new protobuf library (and corresponding code generator) for Go: google.golang.org/protobuf. It is fairly compatible with the previous v1 API (github.com/golang/protobuf), but there are some changes. This patch adjusts the code and generated files to the new API. The on-wire/on-disk format remains unchanged so this should be transparent to the users.
This commit is contained in:
@@ -20,9 +20,9 @@ import (
|
||||
"blitiri.com.ar/go/chasquid/internal/envelope"
|
||||
"blitiri.com.ar/go/chasquid/internal/normalize"
|
||||
"blitiri.com.ar/go/chasquid/internal/userdb"
|
||||
"google.golang.org/protobuf/encoding/prototext"
|
||||
|
||||
"github.com/docopt/docopt-go"
|
||||
"github.com/golang/protobuf/proto"
|
||||
"golang.org/x/crypto/ssh/terminal"
|
||||
)
|
||||
|
||||
@@ -253,7 +253,7 @@ func printConfig() {
|
||||
Fatalf("Error reading config")
|
||||
}
|
||||
|
||||
fmt.Println(proto.MarshalTextString(conf))
|
||||
fmt.Println(prototext.Format(conf))
|
||||
}
|
||||
|
||||
// chasquid-util domaininfo-remove <domain>
|
||||
|
||||
Reference in New Issue
Block a user