buildbot.sh: additional error-checking.
Merge branch 'master' of git.funtoo.org:metro