summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2010-01-27 13:27:10 -0800
committerRuss Cox <rsc@golang.org>2010-01-27 13:27:10 -0800
commit52427b6058a0cc427ac9266afc8d0f8056d30a11 (patch)
tree18548e13f965c15840c1d3792708f9fb906efa59 /misc
parent9ff67207068a645cc9f1cc6cfbf07ae214ec4c75 (diff)
downloadgo-52427b6058a0cc427ac9266afc8d0f8056d30a11.tar.gz
dashboard: look for key in $GOROOT before $HOME
TBR=agl1 CC=golang-dev http://codereview.appspot.com/195076
Diffstat (limited to 'misc')
-rw-r--r--misc/dashboard/buildcontrol.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/misc/dashboard/buildcontrol.py b/misc/dashboard/buildcontrol.py
index 7851de731..b2f7728e9 100644
--- a/misc/dashboard/buildcontrol.py
+++ b/misc/dashboard/buildcontrol.py
@@ -35,10 +35,13 @@ def main(args):
buildport = int(os.environ['BUILDPORT'])
try:
- buildkey = file('%s/.gobuildkey' % os.environ['HOME'], 'r').read().strip()
+ buildkey = file('%s/.gobuildkey' % os.environ['GOROOT'], 'r').read().strip()
except IOError:
- print >>sys.stderr, "Need key in ~/.gobuildkey"
- return
+ try:
+ buildkey = file('%s/.gobuildkey' % os.environ['HOME'], 'r').read().strip()
+ except IOError:
+ print >>sys.stderr, "Need key in $GOROOT/.gobuildkey or ~/.gobuildkey"
+ return
if args[1] == 'init':
return doInit(args)