Wrap the return result of a wrapped function.

command_wrapper.py

 #!/usr/bin/python
 #
 # Copyright (c) 2010 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.
 
 """Wrapper that does auto-retry and stats logging for command invocation.
 
 Various command line tools in use: gsutil, curl have spurious failure.
 This wrapper will track stats to an AppEngine based service to
@@ skipping 54 matching lines @@
   f = urllib.urlopen(options.logurl, params)
   ret = f.read()
   f.close()
   try:
     return int(ret) != 0
   except ValueError:
     return 0
 
 
 def RunWithTimeout(timeout, func, *args, **kwargs):
-  result = None
+  wrapper = { 'result': None }
   def CallFunc():
-    result = func(*args, **kwargs)
+    wrapper['result'] = func(*args, **kwargs)
   th = threading.Thread(target=CallFunc)
   th.start()
   th.join(timeout)
-  return result
+  return wrapper['result']
 
 
 def main(argv):
   parser = optparse.OptionParser()
   parser.add_option('-r', '--retries', dest='retries',
                     type='int', default=10,
                     help='number of times to retry on failure')
   parser.add_option('-u', '--logurl', dest='logurl',
                     default='https://command-wrapper.appspot.com/log',
                     help='URL to log invocations/failures to')
@@ skipping 29 matching lines @@
     print 'Command %s failed with retcode %d, try %d.' % (
         ' '.join(args), p.returncode, r + 1)
   print 'Command %s failed %d retries, giving up.' % (
       ' '.join(args), options.retries)
 
   return p.returncode
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))