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

Merge branch 'master' of ssh://camlistore.org:29418/camlistore

This commit is contained in:
Brett Slatkin 2012-12-23 15:25:50 -08:00
parent dd5e72cb27 2d094d4ea5
commit 946752d851
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/buildbot/bot.go
View File

@ -474,7 +474,7 @@ func runCmd(tsk string) (string, error) {
cmd.Stderr = &stderr cmd.Stderr = &stderr
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
return "", fmt.Errorf("error with %v: %v\n", getCurrentTask().Cmd, stderr.String()) return "", fmt.Errorf("%v: %v\n", stdout.String(), stderr.String())
} }
return stdout.String(), nil return stdout.String(), nil
} }
@ -1220,7 +1220,9 @@ var taskHTML = `
{{end}} {{end}}
{{if .Err}} {{if .Err}}
<h2>Error:</h2> <h2>Error:</h2>
<p>{{.Err}}</p> <pre>
{{.Err}}
</pre>
{{end}} {{end}}
</body> </body>
</html> </html>