Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

devcam: fix breakage caused from envvar strconv changes. 

Change-Id: Id05d00d9b82924242905ccbc7a7e8002dc4859a7
This commit is contained in:
Brad Fitzpatrick 2013-09-08 12:32:13 -07:00
parent d2d65912d9
commit ff4e491b3b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dev/devcam/camget.go
View File

@ -40,7 +40,7 @@ type getCmd struct {
tls bool tls bool
// end of flag vars // end of flag vars
verbose string // set by CAMLI_QUIET verbose bool // set by CAMLI_QUIET
camliSrcRoot string // the camlistore source tree 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.path, "path", "/bs", "Optional URL prefix path.")
flags.StringVar(&cmd.port, "port", "3179", "Port camlistore is listening on.") flags.StringVar(&cmd.port, "port", "3179", "Port camlistore is listening on.")
flags.BoolVar(&cmd.tls, "tls", false, "Use TLS.") flags.BoolVar(&cmd.tls, "tls", false, "Use TLS.")
cmd.verbose = "false"
return cmd return cmd
}) })
} }
@ -89,7 +88,7 @@ func (c *getCmd) RunCommand(args []string) error {
cmdBin := filepath.Join(c.camliSrcRoot, "bin", "camget") cmdBin := filepath.Join(c.camliSrcRoot, "bin", "camget")
cmdArgs := []string{ cmdArgs := []string{
"-verbose=" + c.verbose, "-verbose=" + strconv.FormatBool(c.verbose),
} }
if !isSharedMode(args) { if !isSharedMode(args) {
blobserver := "http://localhost:" + c.port + c.path blobserver := "http://localhost:" + c.port + c.path

5
dev/devcam/camput.go
View File

@ -40,7 +40,7 @@ type putCmd struct {
tls bool tls bool
// end of flag vars // end of flag vars
verbose string // set by CAMLI_QUIET verbose bool // set by CAMLI_QUIET
camliSrcRoot string // the camlistore source tree camliSrcRoot string // the camlistore source tree
} }
@ -51,7 +51,6 @@ func init() {
flags.BoolVar(&cmd.tls, "tls", false, "Use TLS.") flags.BoolVar(&cmd.tls, "tls", false, "Use TLS.")
flags.StringVar(&cmd.path, "path", "/", "Optional URL prefix path.") flags.StringVar(&cmd.path, "path", "/", "Optional URL prefix path.")
flags.StringVar(&cmd.port, "port", "3179", "Port camlistore is listening on.") flags.StringVar(&cmd.port, "port", "3179", "Port camlistore is listening on.")
cmd.verbose = "false"
return cmd return cmd
}) })
} }
@ -94,7 +93,7 @@ func (c *putCmd) RunCommand(args []string) error {
cmdBin := filepath.Join(c.camliSrcRoot, "bin", "camput") cmdBin := filepath.Join(c.camliSrcRoot, "bin", "camput")
cmdArgs := []string{ cmdArgs := []string{
"-verbose=" + c.verbose, "-verbose=" + strconv.FormatBool(c.verbose),
"-server=" + blobserver, "-server=" + blobserver,
} }
cmdArgs = append(cmdArgs, args...) cmdArgs = append(cmdArgs, args...)