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

Addressing small nits 

Signed-off-by: Diogo Monica <diogo@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Diogo Monica <diogo@docker.com> (github: endophage)
This commit is contained in:
Diogo Monica 2015-11-11 11:50:18 -08:00 committed by David Lawrence
parent 0344dfc038
commit 4c2fcda620
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/notary/keys.go
View File

@ -137,6 +137,8 @@ func keysList(cmd *cobra.Command, args []string) {
} }
func keysGenerateRootKey(cmd *cobra.Command, args []string) { func keysGenerateRootKey(cmd *cobra.Command, args []string) {
// We require one or no arguments (since we have a default value), but if the
// user passes in more than one argument, we error out.
if len(args) > 1 { if len(args) > 1 {
cmd.Usage() cmd.Usage()
fatalf("Please provide only one Algorithm as an argument to generate (rsa, ecdsa)") fatalf("Please provide only one Algorithm as an argument to generate (rsa, ecdsa)")

4
cmd/notary/main.go
View File

@ -82,13 +82,13 @@ func parseConfig() {
} }
// At this point we either have the default value or the one set by the config. // At this point we either have the default value or the one set by the config.
// Either way, the command-line flag has precedence and overwrives the value // Either way, the command-line flag has precedence and overwrites the value
if trustDir != "" { if trustDir != "" {
mainViper.Set("trust_dir", trustDir) mainViper.Set("trust_dir", trustDir)
} }
// Expands all the possible ~/ that have been given, either through -d or config // Expands all the possible ~/ that have been given, either through -d or config
// If there is no error, user it, if not, attempt to use whatever the user gave us // If there is no error, use it, if not, attempt to use whatever the user gave us
expandedTrustDir, err := homedir.Expand(mainViper.GetString("trust_dir")) expandedTrustDir, err := homedir.Expand(mainViper.GetString("trust_dir"))
if err == nil { if err == nil {
mainViper.Set("trust_dir", expandedTrustDir) mainViper.Set("trust_dir", expandedTrustDir)