Adding more assertions....

gsd_generate_index/gsd_generate_index.py

 #!/usr/bin/python
 # Copyright (c) 2008-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.
 
 """Generate index.html files for a Google Storage for Developers directory.
 
 Google Storage for Developers provides only a raw set of objects.
 For some buckets we would like to be able to support browsing of the directory
 tree. This utility will generate the needed index and upload/update it.
@@ skipping 33 matching lines @@
     sz = str(int(sz / 100000000) / 10.0) + 'G'
   return sz
 
 
 def GetPathInfo(path, options):
   """Collect size, date, md5 for a give gsd path."""
   # Check current state.
   cmd = [options.gsutil, 'ls', '-l', path]
   p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
   p_stdout, _ = p.communicate()
+  assert p.returncode == 0
   # Extract intersting fields.
   fields = {}
   fields['size'] = FixupSize(re.search('\tObject size:\t([0-9]+)\n',
                                        p_stdout).group(1))
   fields['md5'] = re.search('\tMD5:\t([^\n]+)\n', p_stdout).group(1)
   fields['date'] = re.search('\tLast mod:\t([^\n]+)\n', p_stdout).group(1)
   return fields
 
 
 def GenerateIndex(path, children, directories, options):
@@ skipping 39 matching lines @@
       index += '<td>%s</td>' % fields['date']
       index += '<td><b>%s</b></td>' % fields['size']
       index += '<td>%s</td>' % fields['md5']
     index += '</tr>'
   index += '<tr><th colspan="4"><hr></th></tr>'
   index += '</table>'
   index += '</body>'
   index += '</html>'
   # Check current state.
   cmd = [options.gsutil, 'cat', posixpath.join(path, GENERATED_INDEX)]
-  p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+  p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
   p_stdout, _ = p.communicate()
-  # Done if it's alrady right.
-  if p_stdout == index and not options.force:
+  # Done if it's alrady right (and the cat worked).
+  if p.returncode == 0 and p_stdout == index and not options.force:
     print '%s -- skipping, up to date' % path
     return
   # Write to a file.
   f = tempfile.NamedTemporaryFile(suffix='.html')
   filename = f.name
   f.write(index)
   f.flush()
   # Upload index.
   cmd = [options.gsutil, 'cp']
-  if options.acl:
-    cmd += ['-a', options.acl]
   cmd += [filename, posixpath.join(path, GENERATED_INDEX)]
   p = subprocess.Popen(cmd)
   p.communicate()
+  assert p.returncode == 0
+  # Optionally update acl.
+  if options.acl:
+    cmd = [options.gsutil, 'setacl', options.acl]
+    cmd += [posixpath.join(path, GENERATED_INDEX)]
+    p = subprocess.Popen(cmd)
+    p.communicate()
+    assert p.returncode == 0
   print '%s -- updated index' % path
 
 
 def GenerateIndexes(path, options):
   """Generate all relevant indexes for a given gsd path."""
   # Get a list of objects under this prefix.
   cmd = [options.gsutil, 'ls', posixpath.join(path, '*')]
   p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
   p_stdout, _ = p.communicate()
+  assert p.returncode == 0
   objects = str(p_stdout).splitlines()
   objects = [o for o in objects if posixpath.basename(o) != GENERATED_INDEX]
   # Find common prefixes.
   directories = set()
   for o in objects:
     part = posixpath.dirname(o)
     while part.startswith(path):
       directories.add(part)
       part = posixpath.dirname(part)
   objects += list(directories)
@@ skipping 20 matching lines @@
                     dest='gsutil', help='path to gsutil')
   options, args = parser.parse_args(argv)
   if len(args) != 2 or not args[1].startswith('gs://'):
     parser.print_help()
     return 1
   return GenerateIndexes(args[1], options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))