mirror of https://github.com/perkeep/perkeep.git
Merge "Fixed calls to formatting functions"
This commit is contained in:
commit
7bd5e287d4
|
@ -179,7 +179,7 @@ func (a *Handler) Start() error {
|
|||
if e := os.Getenv("CAMLI_APP_BINDIR"); e != "" {
|
||||
binPath, err = exec.LookPath(filepath.Join(e, name))
|
||||
if err != nil {
|
||||
log.Printf("%q executable not found in %q", e)
|
||||
log.Printf("%q executable not found in %q", name, e)
|
||||
}
|
||||
}
|
||||
if binPath == "" || err != nil {
|
||||
|
|
|
@ -61,7 +61,7 @@ func (hl *handlerLoader) initPublisherRootNode(ah *app.Handler) error {
|
|||
}
|
||||
camliRoot, ok := appConfig["camliRoot"].(string)
|
||||
if !ok {
|
||||
return fmt.Errorf("camliRoot in publisher app handler appConfig is %T, want string, was %T", appConfig["camliRoot"])
|
||||
return fmt.Errorf("camliRoot in publisher app handler appConfig is %T, want string", appConfig["camliRoot"])
|
||||
}
|
||||
result, err := camliRootQuery(camliRoot)
|
||||
if err == nil && len(result.Blobs) > 0 && result.Blobs[0].Blob.Valid() {
|
||||
|
|
|
@ -176,7 +176,7 @@ func genSelfTLS(listen string) error {
|
|||
|
||||
keyOut, err := os.OpenFile(defKey, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to open %s for writing:", defKey, err)
|
||||
return fmt.Errorf("failed to open %s for writing: %s", defKey, err)
|
||||
}
|
||||
pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
|
||||
keyOut.Close()
|
||||
|
|
Loading…
Reference in New Issue