Recursive copy with gsutil does only work work if more then one object is inside the source directo…

editor/build/promote.py

 #!/usr/bin/env python
 # 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # Dart Editor promote and google storage cleanup tools.
 
 import gsutil
 import imp
@@ skipping 101 matching lines @@
     print 'At least one command must be specified'
     parser.print_help()
     sys.exit(1)
 
   if args[0] == 'promote':
     command = 'promote'
     if options.revision is None:
       print 'You must specify a --revision to specify which revision to promote'
       parser.print_help()
       sys.exit(3)
+
+    # Make sure revision is a valid integer
+    try:
+      _ = int(options.revision)
+    except:
+      print 'You must supply a valid integer argument to --revision to promote'
+      parser.print_help()
+      sys.exit(3)
+
+    # Make sure options.channel is a valid channel if given
+    if options.channel:
+      if options.channel not in bot_utils.Channel.ALL_CHANNELS:
+        print 'You must supply a valid channel to --channel to promote'
+        parser.print_help()
+        sys.exit(3)
+
     if not (options.continuous or options.integration or
             options.testing or options.trunk or options.internal or
             options.channel):
       print ('Specify --continuous, --integration, --testing, --trunk or '
             '--channel=be/dev/stable')
       parser.print_help()
       sys.exit(4)
     if options.continuous and options.integration:
       print 'continuous and integration can not be specified at the same time'
       parser.print_help()
@@ skipping 150 matching lines @@
   _Gsutil(['cp', '-r', '-a', 'public-read', src + '*', dest])
 
 def _PromoteDartArchiveBuild(channel, revision):
   # These namer objects will be used to create GCS object URIs. For the
   # structure we use, please see tools/bots/bot_utils.py:GCSNamer
   raw_namer = bot_utils.GCSNamer(channel, bot_utils.ReleaseType.RAW)
   signed_namer = bot_utils.GCSNamer(channel, bot_utils.ReleaseType.SIGNED)
   release_namer = bot_utils.GCSNamer(channel, bot_utils.ReleaseType.RELEASE)
 
   def promote(to_revision):
+    def safety_check_on_gs_path(gs_path, revision, channel):
+      if not ((revision == 'latest' or int(revision) > 0)
+              and len(channel) > 0
+              and ('%s' % revision) in gs_path
+              and channel in gs_path):
+        raise Exception(
+            "InternalError: Sanity check failed on GS URI: %s" % gs_path)
+
+    def remove_gs_directory(gs_path):
+      safety_check_on_gs_path(gs_path, to_revision, channel)
+      _Gsutil(['-m', 'rm', '-R', '-f', gs_path])
+
     # Copy VERSION file.
     from_loc = raw_namer.version_filepath(revision)
     to_loc = release_namer.version_filepath(to_revision)
     _Gsutil(['cp', '-a', 'public-read', from_loc, to_loc])
 
     # Copy sdk directory.
     from_loc = raw_namer.sdk_directory(revision)
     to_loc = release_namer.sdk_directory(to_revision)
+    remove_gs_directory(to_loc)
     _Gsutil(['-m', 'cp', '-a', 'public-read', '-R', from_loc, to_loc])
 
     # Copy eclipse update directory.
     from_loc = raw_namer.editor_eclipse_update_directory(revision)
     to_loc = release_namer.editor_eclipse_update_directory(to_revision)
+    remove_gs_directory(to_loc)
     _Gsutil(['-m', 'cp', '-a', 'public-read', '-R', from_loc, to_loc])
 
-    # Copy api-docs directory.
-    from_loc = raw_namer.apidocs_directory(revision)
-    to_loc = release_namer.apidocs_directory(to_revision)
-    _Gsutil(['-m', 'cp', '-a', 'public-read', '-R', from_loc, to_loc])
+    # Copy api-docs zipfile.
+    from_loc = raw_namer.apidocs_zipfilepath(revision)
+    to_loc = release_namer.apidocs_zipfilepath(to_revision)
+    _Gsutil(['-m', 'cp', '-a', 'public-read', from_loc, to_loc])
 
     # Copy dartium directory.
     from_loc = raw_namer.dartium_directory(revision)
     to_loc = release_namer.dartium_directory(to_revision)
+    remove_gs_directory(to_loc)
     _Gsutil(['-m', 'cp', '-a', 'public-read', '-R', from_loc, to_loc])
 
     # Copy editor zip files.
+    target_editor_dir = release_namer.editor_directory(to_revision)
+    remove_gs_directory(target_editor_dir)
     for system in ['windows', 'macos', 'linux']:
       for arch in ['ia32', 'x64']:
         from_namer = raw_namer
         # We have signed versions of the editor for windows and macos.
         if system == 'windows' or system == 'macos':
           from_namer = signed_namer
         from_loc = from_namer.editor_zipfilepath(revision, system, arch)
         to_loc = release_namer.editor_zipfilepath(to_revision, system, arch)
         _Gsutil(['cp', '-a', 'public-read', from_loc, to_loc])
         _Gsutil(['cp', '-a', 'public-read', from_loc + '.md5sum',
@@ skipping 23 matching lines @@
   if directory is not None:
     cwd = os.getcwd()
     os.chdir(directory)
   subprocess.call(cmd, env=os.environ)
   if directory is not None:
     os.chdir(cwd)
 
 
 if __name__ == '__main__':
   sys.exit(main())