Speculative fix for SKP partner-dir upload

tools/skp/webpages_playback.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Archives or replays webpages and creates SKPs in a Google Storage location.
 
 To archive webpages and store SKP files (archives should be rarely updated):
 
 cd skia
@@ skipping 59 matching lines @@
 
 from common.py.utils import gs_utils
 from common.py.utils import shell_utils
 
 ROOT_PLAYBACK_DIR_NAME = 'playback'
 SKPICTURES_DIR_NAME = 'skps'
 
 PARTNERS_GS_BUCKET = 'gs://chrome-partner-telemetry'
 
 # Local archive and SKP directories.
-LOCAL_PLAYBACK_ROOT_DIR = os.path.join(
-    tempfile.gettempdir(), ROOT_PLAYBACK_DIR_NAME)
 LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR = os.path.join(
     os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data')
 TMP_SKP_DIR = tempfile.mkdtemp()
 
 # Location of the credentials.json file and the string that represents missing
 # passwords.
 CREDENTIALS_FILE_PATH = os.path.join(
     os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data',
     'credentials.json'
 )
@@ skipping 133 matching lines @@
           "password": "facebook_testing_account_password"
         }
       }\n\n""" % CREDENTIALS_FILE_PATH
       raw_input("Please press a key when you are ready to proceed...")
 
     # Delete any left over data files in the data directory.
     for archive_file in glob.glob(
         os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR, 'skia_*')):
       os.remove(archive_file)
 
-    # Delete the local root directory if it already exists.
-    if os.path.exists(LOCAL_PLAYBACK_ROOT_DIR):
-      shutil.rmtree(LOCAL_PLAYBACK_ROOT_DIR)
-
     # Create the required local storage directories.
     self._CreateLocalStorageDirs()
 
     # Start the timer.
     start_time = time.time()
 
     # Loop through all page_sets.
     for page_set in self._page_sets:
 
       page_set_basename = os.path.basename(page_set).split('.')[0]
@@ skipping 111 matching lines @@
     print '\n\n'
 
     if self._upload:
       print '\n\n=======Uploading to %s=======\n\n' % self.gs.target_type()
       # Copy the directory structure in the root directory into Google Storage.
       dest_dir_name = ROOT_PLAYBACK_DIR_NAME
       if self._alternate_upload_dir:
         dest_dir_name = self._alternate_upload_dir
 
       self.gs.upload_dir_contents(
-          LOCAL_PLAYBACK_ROOT_DIR, dest_dir=dest_dir_name,
+          self._local_skp_dir, dest_dir=dest_dir_name,
           upload_if=gs_utils.GSUtils.UploadIf.IF_MODIFIED,
           predefined_acl=GS_PREDEFINED_ACL,
           fine_grained_acl_list=GS_FINE_GRAINED_ACL_LIST)
 
       print '\n\n=======New SKPs have been uploaded to %s =======\n\n' % (
           posixpath.join(self.gs.target_name(), dest_dir_name,
                          SKPICTURES_DIR_NAME))
 
     else:
       print '\n\n=======Not Uploading to %s=======\n\n' % self.gs.target_type()
       print 'Generated resources are available in %s\n\n' % (
-          LOCAL_PLAYBACK_ROOT_DIR)
+          self._local_skp_dir)
 
     if self._upload_to_partner_bucket:
       print '\n\n=======Uploading to Partner bucket %s =======\n\n' % (
           PARTNERS_GS_BUCKET)
       partner_gs = GoogleStorageDataStore(PARTNERS_GS_BUCKET)
       partner_gs.delete_path(SKPICTURES_DIR_NAME)
+      print 'Uploading %s to %s' % (self._local_skp_dir, SKPICTURES_DIR_NAME)
       partner_gs.upload_dir_contents(
-          os.path.join(LOCAL_PLAYBACK_ROOT_DIR, SKPICTURES_DIR_NAME),
+          self._local_skp_dir,
           dest_dir=SKPICTURES_DIR_NAME,
           upload_if=gs_utils.GSUtils.UploadIf.IF_MODIFIED)
       print '\n\n=======New SKPs have been uploaded to %s =======\n\n' % (
           posixpath.join(partner_gs.target_name(), SKPICTURES_DIR_NAME))
 
     return 0
 
   def _GetSkiaSkpFileName(self, page_set):
     """Returns the SKP file name for Skia page sets."""
     # /path/to/skia_yahooanswers_desktop.py -> skia_yahooanswers_desktop.py
@@ skipping 197 matching lines @@
            '--skia_tools is specified then the debugger is not run.',
       default=False)
   option_parser.add_option(
       '', '--skp_prefix',
       help='Prefix to add to the names of generated SKPs.',
       default=None)
   options, unused_args = option_parser.parse_args()
 
   playback = SkPicturePlayback(options)
   sys.exit(playback.Run())