Changeset 2542

Timestamp:

02/22/2016 07:22:56 AM (10 years ago)

Author:

dd32

Message:

Themes Directory: Switch up the Theme upload process to commit to SVN before creating the Trac ticket & Post.

This allows us to abort early if the code cannot be commited for whatever reason, avoiding manual work needing to be done to allow the upload.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

@@ -262 +262 @@
         // Let's save everything and get things wrapped up.
 
+        // Create a new version in SVN.
+        $result = $this->add_to_svn();
+        if ( ! $result ) {
+            /* translators: %s: mailto link */
+            return sprintf( __( 'There was an error comitting your theme to SVN. Please try again, if this error persists report the error to %s.', 'wporg-themes' ),
+                '<a href="mailto:themes@wordpress.org">themes@wordpress.org</a>'
+            );
+        }
+
         // Get all Trac ticket information set up.
         $this->prepare_trac_ticket();
@@ -277 +286 @@
         // Add a or update the Theme Directory entry for this theme.
         $this->create_or_update_theme_post( $ticket_id );
-
-        // Create a new version in SVN.
-        $this->add_to_svn();
 
         // Send theme author an email for peace of mind.
@@ -669 +675 @@
         $password   = escapeshellarg( THEME_DROPBOX_PASSWORD );
 
-        exec( "{$svn} --non-interactive --username themedropbox --password {$password} --no-auto-props -m {$import_msg} import {$theme_path} {$svn_path}" );
+        $result = exec( "{$svn} --non-interactive --username themedropbox --password {$password} --no-auto-props -m {$import_msg} import {$theme_path} {$svn_path} 2>&1" );
+
+        return ( false !== strpos( $result, 'Committed revision' ) );
     }