diff --git a/backend/local/local.go b/backend/local/local.go index 753e905fa..c4ad266dc 100644 --- a/backend/local/local.go +++ b/backend/local/local.go @@ -41,7 +41,7 @@ func Open(dir string) (*Local, error) { } // Create creates all the necessary files and directories for a new local -// backend at dir. Afterwards a new config blob should must created. +// backend at dir. Afterwards a new config blob should be created. func Create(dir string) (*Local, error) { dirs := []string{ dir, @@ -53,7 +53,7 @@ func Create(dir string) (*Local, error) { filepath.Join(dir, backend.Paths.Temp), } - // test if config file already exist + // test if config file already exists _, err := os.Lstat(backend.Paths.Config) if err == nil { return nil, errors.New("config file already exists") diff --git a/backend/sftp/sftp.go b/backend/sftp/sftp.go index 2207d897a..0397066fd 100644 --- a/backend/sftp/sftp.go +++ b/backend/sftp/sftp.go @@ -89,7 +89,7 @@ func Open(dir string, program string, args ...string) (*SFTP, error) { } // Create creates all the necessary files and directories for a new sftp -// backend at dir. Afterwards a new config blob should must created. +// backend at dir. Afterwards a new config blob should be created. func Create(dir string, program string, args ...string) (*SFTP, error) { sftp, err := startClient(program, args...) if err != nil { @@ -106,7 +106,7 @@ func Create(dir string, program string, args ...string) (*SFTP, error) { filepath.Join(dir, backend.Paths.Temp), } - // test if config file already exist + // test if config file already exists _, err = sftp.c.Lstat(backend.Paths.Config) if err == nil { return nil, errors.New("config file already exists") diff --git a/server/server.go b/server/server.go index d8cc6dd98..74021f93e 100644 --- a/server/server.go +++ b/server/server.go @@ -149,7 +149,7 @@ func (s *Server) LoadBlob(t pack.BlobType, id backend.ID) ([]byte, error) { return plain, nil } -// LoadJSONEncrypted decrypts the data and afterwards calls json.Unmarshal on +// LoadJSONUnpacked decrypts the data and afterwards calls json.Unmarshal on // the item. func (s *Server) LoadJSONUnpacked(t backend.Type, id backend.ID, item interface{}) error { // load blob from backend @@ -566,8 +566,8 @@ func (s *Server) loadConfig(cfg *Config) error { return nil } -// SearchKey tries to find a key for which the supplied password works, -// afterwards the repository config is read and parsed. +// SearchKey finds a key with the supplied password, afterwards the config is +// read and parsed. func (s *Server) SearchKey(password string) error { key, err := SearchKey(s, password) if err != nil {