webpages_playback: Make --upload_to_partner_bucket work without --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 358 matching lines @@
       self.gs.upload_dir_contents(
           LOCAL_PLAYBACK_ROOT_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))
 
-      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)
-        partner_gs.upload_dir_contents(
-            os.path.join(LOCAL_PLAYBACK_ROOT_DIR, SKPICTURES_DIR_NAME),
-            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))
     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)
 
+    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)
+      partner_gs.upload_dir_contents(
+          os.path.join(LOCAL_PLAYBACK_ROOT_DIR, SKPICTURES_DIR_NAME),
+          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
     ps_filename = os.path.basename(page_set)
     # skia_yahooanswers_desktop.py -> skia_yahooanswers_desktop
     ps_basename, _ = os.path.splitext(ps_filename)
     # skia_yahooanswers_desktop -> skia, yahooanswers, desktop
     _, page_name, device = ps_basename.split('_')
@@ skipping 192 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())