From 66ac4b2901abbb5b9843d84c5498d28ca295c9e8 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Wed, 27 Jan 2010 13:27:10 -0800
Subject: dashboard: look for key in $GOROOT before $HOME

TBR=agl1
CC=golang-dev
http://codereview.appspot.com/195076
---
 misc/dashboard/buildcontrol.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'misc/dashboard/buildcontrol.py')

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)
-- 
cgit v1.2.3