From 2b091db606e0a175664b09a0db7dc2a6ea8ce185 Mon Sep 17 00:00:00 2001 From: mpl Date: Mon, 31 Mar 2014 18:00:25 +0200 Subject: [PATCH] camput init: do not call DefaultSecretRingFile in init() Because we fail in tests when calling methods that rely on default paths. (See buildinfo.TestingLinked) Change-Id: I4d3a99dd2ea83a8351a993353e5e7c29d3cb17a7 --- cmd/camput/init.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/camput/init.go b/cmd/camput/init.go index 462393813..8de21cbda 100644 --- a/cmd/camput/init.go +++ b/cmd/camput/init.go @@ -43,7 +43,7 @@ func init() { cmdmain.RegisterCommand("init", func(flags *flag.FlagSet) cmdmain.CommandRunner { cmd := new(initCmd) flags.BoolVar(&cmd.newKey, "newkey", false, - fmt.Sprintf("Automatically generate a new identity in a new secret ring at %s", osutil.DefaultSecretRingFile())) + "Automatically generate a new identity in a new secret ring at the default location (~/.config/camlistore/identity-secring.gpg on linux).") flags.StringVar(&cmd.keyId, "gpgkey", "", "GPG key ID to use for signing (overrides $GPGKEY environment)") flags.BoolVar(&cmd.noconfig, "noconfig", false, "Stop after creating the public key blob, and do not try and create a config file.") return cmd