From ff4e491b3b88e66c44fa964312b0d3d2da72fac7 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sun, 8 Sep 2013 12:32:13 -0700 Subject: [PATCH] devcam: fix breakage caused from envvar strconv changes. Change-Id: Id05d00d9b82924242905ccbc7a7e8002dc4859a7 --- dev/devcam/camget.go | 5 ++--- dev/devcam/camput.go | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dev/devcam/camget.go b/dev/devcam/camget.go index 48cdb0958..6e53f94b6 100644 --- a/dev/devcam/camget.go +++ b/dev/devcam/camget.go @@ -40,7 +40,7 @@ type getCmd struct { tls bool // end of flag vars - verbose string // set by CAMLI_QUIET + verbose bool // set by CAMLI_QUIET camliSrcRoot string // the camlistore source tree } @@ -50,7 +50,6 @@ func init() { flags.StringVar(&cmd.path, "path", "/bs", "Optional URL prefix path.") flags.StringVar(&cmd.port, "port", "3179", "Port camlistore is listening on.") flags.BoolVar(&cmd.tls, "tls", false, "Use TLS.") - cmd.verbose = "false" return cmd }) } @@ -89,7 +88,7 @@ func (c *getCmd) RunCommand(args []string) error { cmdBin := filepath.Join(c.camliSrcRoot, "bin", "camget") cmdArgs := []string{ - "-verbose=" + c.verbose, + "-verbose=" + strconv.FormatBool(c.verbose), } if !isSharedMode(args) { blobserver := "http://localhost:" + c.port + c.path diff --git a/dev/devcam/camput.go b/dev/devcam/camput.go index 70dd4bb9a..6a4c00098 100644 --- a/dev/devcam/camput.go +++ b/dev/devcam/camput.go @@ -40,7 +40,7 @@ type putCmd struct { tls bool // end of flag vars - verbose string // set by CAMLI_QUIET + verbose bool // set by CAMLI_QUIET camliSrcRoot string // the camlistore source tree } @@ -51,7 +51,6 @@ func init() { flags.BoolVar(&cmd.tls, "tls", false, "Use TLS.") flags.StringVar(&cmd.path, "path", "/", "Optional URL prefix path.") flags.StringVar(&cmd.port, "port", "3179", "Port camlistore is listening on.") - cmd.verbose = "false" return cmd }) } @@ -94,7 +93,7 @@ func (c *putCmd) RunCommand(args []string) error { cmdBin := filepath.Join(c.camliSrcRoot, "bin", "camput") cmdArgs := []string{ - "-verbose=" + c.verbose, + "-verbose=" + strconv.FormatBool(c.verbose), "-server=" + blobserver, } cmdArgs = append(cmdArgs, args...)