Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ctlv3: fix line parsing for Windows

Browse Source
This commit is contained in:
sharat 2016-09-09 01:58:33 +05:30 committed by Anthony Romano
parent 2435eb9ecd
commit ee2717493a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etcdctl/ctlv3/command/txn_command.go
View File

@ -77,12 +77,13 @@ func readCompares(r *bufio.Reader) (cmps []clientv3.Cmp) {
if err != nil { if err != nil {
ExitWithError(ExitInvalidInput, err) ExitWithError(ExitInvalidInput, err)
} }
if len(line) == 1 {
// remove space from the line
line = strings.TrimSpace(line)
if len(line) == 0 {
break break
} }
// remove trialling \n
line = line[:len(line)-1]
cmp, err := parseCompare(line) cmp, err := parseCompare(line)
if err != nil { if err != nil {
ExitWithError(ExitInvalidInput, err) ExitWithError(ExitInvalidInput, err)
@ -99,12 +100,13 @@ func readOps(r *bufio.Reader) (ops []clientv3.Op) {
if err != nil { if err != nil {
ExitWithError(ExitInvalidInput, err) ExitWithError(ExitInvalidInput, err)
} }
if len(line) == 1 {
// remove space from the line
line = strings.TrimSpace(line)
if len(line) == 0 {
break break
} }
// remove trialling \n
line = line[:len(line)-1]
op, err := parseRequestUnion(line) op, err := parseRequestUnion(line)
if err != nil { if err != nil {
ExitWithError(ExitInvalidInput, err) ExitWithError(ExitInvalidInput, err)