fix problem with #1879

gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.6.20.1031 Beta"
+const APP_VER = "0.6.20.1102 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

models/publickey.go

@@ -243,7 +243,7 @@ func CheckPublicKeyString(content string) (_ string, err error) {
 		}
 		keyType := strings.Trim(sshKeygenOutput[len(sshKeygenOutput)-1], " ()")
 		if minimumKeySize := setting.Service.MinimumKeySizes[keyType]; minimumKeySize == 0 {
-			return "", errors.New("sorry, unrecognized public key type")
+			return "", fmt.Errorf("unrecognized public key type: %s", keyType)
 		} else if keySize < minimumKeySize {
 			return "", fmt.Errorf("the minimum accepted size of a public key %s is %d", keyType, minimumKeySize)
 		}

modules/setting/setting.go

@@ -453,6 +453,7 @@ func newService() {
 	Service.EnableCaptcha = sec.Key("ENABLE_CAPTCHA").MustBool()
 
 	minimumKeySizes := Cfg.Section("service.minimum_key_sizes").Keys()
+	Service.MinimumKeySizes = make(map[string]int)
 	for _, key := range minimumKeySizes {
 		Service.MinimumKeySizes[key.Name()] = key.MustInt()
 	}

templates/.VERSION

@@ -1 +1 @@
-0.6.20.1031 Beta
+0.6.20.1102 Beta