go: Roll Goopfile, remove two no longer used packages.

go/roll_goop.py

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Updates all SHA1s in Goopfile to point to current refs/heads/master.
 
 Horribly slow, but simple.
 
 Supposed to be followed by './env.py goop update' and manual examination of
 all new wonderful packages we now depend on (to setup mirrors for them, etc).
 See README.md.
 """
 
 import os
 import re
 import subprocess
 import sys
 import urllib2
 
 
 GO_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 # Packages that should be checked out via some non-standard ref. Notable
 # examples are packages distributed via gopkg.in hackery.
 EXCEPTIONS = {
-  'github.com/luci/gkvlite': 'refs/heads/32bitKeys',
   'gopkg.in/fsnotify.v0': 'refs/heads/v0',
   'gopkg.in/tomb.v1': 'refs/heads/v1',
   'gopkg.in/yaml.v2': 'refs/heads/v2',
 }
 
 
 def parse_goop_line(line):
   """Line of Goop file -> (package name, ref, mirror repo or None)."""
   chunks = [c.strip() for c in line.split()]
   mirror = None
@@ skipping 64 matching lines @@
   new_goop = '\n'.join(filtered) + '\n'
   if new_goop.strip() == goop.strip():
     print 'No changes.'
     return 0
   with open(os.path.join(GO_DIR, 'Goopfile'), 'wt') as f:
     f.write(new_goop)
   return 0
 
 
 if __name__ == '__main__':
-  main()
+  sys.exit(main())