Ensure that all args with spaces in them remain quoted when used with command_wrapper.py.

command_wrapper.py

 #!/usr/bin/python
 #
 # Copyright (c) 2011 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 77 matching lines @@
                     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')
   (options, args) = parser.parse_args(args=argv[1:])
 
   # Limit tcp connnection timeouts to 10 seconds.
   socket.setdefaulttimeout(10)
 
   command_id = uuid.uuid1()
-  cmd = ' '.join(args)
+
+  # Ensure that args with spaces in them remain quoted.
+  args_quoted = []

[bradn, 2011/11/19 01:09:13]

Why not just requote it all?

+  for arg in args:
+    if ' ' in arg:
+      arg = '"' + arg + '"'
+    args_quoted.append(arg)
+  cmd = ' '.join(args_quoted)
 
   # Log that we're even starting.
   RunWithTimeout(LOG_TIMEOUT, LogCommand,
                  options, command_id, -1, cmd, -1, '', '', 0)
 
   # Try up to a certain number of times.
   for r in range(options.retries):
     tm = time.time()
     p = subprocess.Popen(cmd, shell=True,
                          stdout=subprocess.PIPE,
@@ skipping 12 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))