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

jsonsign: update old code to use fmt.Errorf 

Change-Id: Iedd969e336dd02af6b3bc60590bfc7aa9ea9c89e
This commit is contained in:
Brad Fitzpatrick 2014-01-28 21:52:36 -08:00
parent 0052ec2366
commit 2a3d84824a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/jsonsign/keys.go
View File

@ -62,8 +62,8 @@ func VerifyPublicKeyFile(file, keyid string) (bool, error) {
}
keyId := publicKeyId(key)
if keyId != strings.ToUpper(keyid) {
return false, errors.New(fmt.Sprintf("Key in file %q has id %q; expected %q",
file, keyId, keyid))
return false, fmt.Errorf("Key in file %q has id %q; expected %q",
file, keyId, keyid)
}
return true, nil
}
@ -87,12 +87,12 @@ func openArmoredPublicKeyFile(reader io.ReadCloser) (*packet.PublicKey, error) {
}
p, err := packet.Read(block.Body)
if err != nil {
return nil, errors.New(fmt.Sprintf("Invalid public key blob: %v", err))
return nil, fmt.Errorf("Invalid public key blob: %v", err)
}
pk, ok := p.(*packet.PublicKey)
if !ok {
return nil, errors.New(fmt.Sprintf("Invalid public key blob; not a public key packet"))
return nil, fmt.Errorf("Invalid public key blob; not a public key packet")
}
return pk, nil
}