Changeset 11102

Timestamp:

07/07/2021 06:43:06 AM (4 years ago)

Author:

dd32

Message:

Theme Directory: When a theme upload fails due to Trac ticket creation failures, automatically remove the SVN directory.

This should result in less cleanup when the upload handler or trac is having trouble.

Fixes #5812.

File:

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

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

@@ -428 +428 @@
 
         if ( ! $ticket_id  ) {
+            // Since it's been added to SVN at this point, remove it from SVN to prevent future issues.
+            $this->remove_from_svn( 'Trac ticket creation failed.' );
+
             /* translators: %s: mailto link */
             return sprintf( __( 'There was an error creating a Trac ticket for your theme, please report this error to %s', 'wporg-themes' ),
@@ -1111 +1114 @@
 
         return false;
+    }
+
+    /**
+     * Remove a theme version commited to SVN.
+     */
+    function remove_from_svn( $reason ) {
+        $svn_path = "{$this->theme_slug}/{$this->theme->display( 'Version' )}";
+        if ( ! $this->theme_slug || ! $this->theme->display( 'Version' ) || strlen( $svn_path ) < 3 ) {
+            return false;
+        }
+
+        $import_msg = 'Removing theme %1$s - %2$s: %3$s';
+        $import_msg = escapeshellarg( sprintf( $import_msg, $this->theme->display( 'Name' ), $this->theme->display( 'Version' ), $reason ) );
+        $svn_path   = escapeshellarg( "https://themes.svn.wordpress.org/{$svn_path}" );
+        $password   = escapeshellarg( THEME_DROPBOX_PASSWORD );
+
+        $last_line = $this->exec_with_notify( self::SVN . " --non-interactive --username themedropbox --password {$password} -m {$import_msg} rm {$svn_path}" );
+
+        return (bool) preg_match( '/Committed revision (\d+)\./i', $last_line );
     }