From: Russ Cox <rsc@golang.org>
Date: Wed, 27 Jan 2010 21:27:10 +0000 (-0800)
Subject: dashboard: look for key in $GOROOT before $HOME
X-Git-Tag: weekly.2010-01-27~10
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c40c974d33e925d3f1f32a1c708fdb55aadcd764;p=gostls13.git

dashboard: look for key in $GOROOT before $HOME

TBR=agl1
CC=golang-dev
https://golang.org/cl/195076
---

diff --git a/misc/dashboard/buildcontrol.py b/misc/dashboard/buildcontrol.py
index 7851de731d..b2f7728e97 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)