Switching from os.uname to platform.uname, since os.uname isn't available on...

command_wrapper/bin/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
 help track down the cause of failures, as well as add retry logic.
 """
 
 
 import optparse
 import os
+import platform
 import subprocess
 import sys
 import time
 import urllib
 import uuid
 
 
 def LogCommand(options, command_id,
                attempt, cmd, returncode, stdout, stderr, runtime):
   """Log a command invocation and result to a central location.
 
   Arguments:
     options: parsed options
     command_id: unique id for this command (shared by all retries)
     attempt: which try numbered from 0
     cmd: command run
     returncode: return code from running command
     stdout: text of stdout
     stderr: text of stderr
     runtime: command runtime in seconds
   """
-  uname = os.uname()
+  uname = platform.uname()
   params = urllib.urlencode({
       'attempt': str(attempt),
       'cwd': os.getcwd(),
       'command_id': command_id,
       'command': cmd,
       'returncode': str(returncode),
       'stdout': stdout[:400],
       'stderr': stderr[:400],
       'runtime': str(runtime),
       'retries': str(options.retries),
       'uname_sysname': uname[0],
       'uname_nodename': uname[1],
       'uname_release': uname[2],
       'uname_version': uname[3],
       'uname_machine': uname[4],
+      'uname_processor': uname[5],
   })
   f = urllib.urlopen(options.logurl, params)
   f.read()
   f.close()
 
 
 def main(argv):
   parser = optparse.OptionParser()
   parser.add_option('-r', '--retries', dest='retries',
                     type='int', default=10,
@@ skipping 21 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))