Merge branch 'master' of github.com:grafana/grafana

This commit is contained in:
Torkel Ödegaard 2016-03-13 19:21:56 +01:00
commit 2527289e3e

View File

@ -14,6 +14,7 @@ import (
"os"
"path"
"regexp"
"strings"
)
func validateInput(c CommandLine, pluginFolder string) error {
@ -160,7 +161,11 @@ func downloadFile(pluginName, filePath, url string) (err error) {
} else {
dst, err := os.Create(newFile)
if err != nil {
log.Errorf("%v", err)
if strings.Contains(err.Error(), "permission denied") {
return fmt.Errorf(
"Could not create file %s. permission deined. Make sure you have write access to plugindir",
newFile)
}
}
defer dst.Close()
src, err := zf.Open()