made sure password was required, fixed docker help issue with login prompt

This commit is contained in:
Ken Cochrane 2013-03-15 07:49:27 -07:00
Родитель 7ec6a311f8
Коммит 878ae25980
1 изменённых файлов: 8 добавлений и 0 удалений

Просмотреть файл

@ -74,6 +74,10 @@ func (srv *Server) Help() string {
// 'docker login': login / register a user to registry service.
func (srv *Server) CmdLogin(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
cmd := rcli.Subcmd(stdout, "login", "", "Register or Login to the docker registry server")
if err := cmd.Parse(args); err != nil {
return nil
}
var username string
var password string
var email string
@ -91,6 +95,10 @@ func (srv *Server) CmdLogin(stdin io.ReadCloser, stdout io.Writer, args ...strin
fmt.Fprint(stdout, "Password: ")
fmt.Fscanf(stdin, "%s", &password)
if password == "" {
return errors.New("Error : Password Required\n")
}
fmt.Fprint(stdout, "Email (", authConfig.Email, "): ")
fmt.Fscanf(stdin, "%s", &email)
if email == "" {