From 6c4960f5b2afae0a92b7551c6597a01a69ccc702 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sat, 7 Feb 2015 09:22:23 +0000
Subject: [PATCH] do not fallback on ncurses input on Cancel
---
cmd/liber/liber.go | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/cmd/liber/liber.go b/cmd/liber/liber.go
index 728a430..52153c4 100644
--- a/cmd/liber/liber.go
+++ b/cmd/liber/liber.go
@@ -109,15 +109,16 @@ func promptUserDialog(path string, choices []*liber.Metadata) (*liber.Metadata,
args = append(args, strconv.Itoa(idx+1))
args = append(args, md.String())
}
- log.Printf("running: %s %v", dialog, args)
var output bytes.Buffer
cmd := exec.Command(dialog, args...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = &output
if err := cmd.Run(); err != nil {
+ // If the user selects 'Cancel', dialog will exit with
+ // status 1.
log.Printf("dialog failed: %v", err)
- return nil, err
+ return nil, nil
}
result, err := strconv.Atoi(strings.TrimSpace(output.String()))
if err != nil {
--
GitLab