From a7b2fbf8a7c829132857403863017cd879c98318 Mon Sep 17 00:00:00 2001 From: Adrian Utrilla Date: Tue, 29 Aug 2017 13:07:45 -0700 Subject: [PATCH] Fix error messages Fixed typo Changed 'sops branch' to 'sops metadata' --- cmd/sops/edit.go | 2 +- sops.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/sops/edit.go b/cmd/sops/edit.go index e64673f04..86aabc87a 100644 --- a/cmd/sops/edit.go +++ b/cmd/sops/edit.go @@ -210,7 +210,7 @@ func runEditorUntilOk(opts runEditorUntilOkOpts) error { if opts.ShowMasterKeys { metadata, err := opts.InputStore.UnmarshalMetadata(edited) if err != nil { - log.Printf("sops branch is invalid: %s.\nPress a key to return to the editor, or Ctrl+C to exit.", err) + log.Printf("sops metadata is invalid: %s.\nPress a key to return to the editor, or Ctrl+C to exit.", err) bufio.NewReader(os.Stdin).ReadByte() continue } diff --git a/sops.go b/sops.go index b3f61ad7d..343167189 100644 --- a/sops.go +++ b/sops.go @@ -329,7 +329,7 @@ func (m *Metadata) MasterKeyCount() int { func (m *Metadata) UpdateMasterKeysWithKeyServices(dataKey []byte, svcs []keyservice.KeyServiceClient) (errs []error) { if len(svcs) == 0 { return []error{ - fmt.Errorf("No key services provided, can not update master keys."), + fmt.Errorf("No key services provided, cansnot update master keys."), } } var parts [][]byte