webpages_playback: Make --upload_to_partner_bucket work without --upload

tools/skp/webpages_playback.py

Index: tools/skp/webpages_playback.py
diff --git a/tools/skp/webpages_playback.py b/tools/skp/webpages_playback.py
index 8e78e0d31e662fcf56fb46cf5c8b1f1826dd05c4..3d9e20bd0243b7472e19cc3834a1422b37914690 100644
--- a/tools/skp/webpages_playback.py
+++ b/tools/skp/webpages_playback.py
@@ -376,22 +376,23 @@ class SkPicturePlayback(object):
           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):