| Index: trunk/extensions/ExtensionDistributor/cron.php |
| — | — | @@ -21,9 +21,9 @@ |
| 22 | 22 | cronExecute(); |
| 23 | 23 | |
| 24 | 24 | function cronExecute() { |
| 25 | | - global $wgExtDistLockFile; |
| | 25 | + global $wgExtDistWorkingCopy, $wgExtDistLockFile; |
| 26 | 26 | if ( $wgExtDistLockFile ) { |
| 27 | | - $lockFile = fopen( $wgExtDistLockFile, 'r+' ); |
| | 27 | + $lockFile = fopen( $wgExtDistLockFile, 'a' ); |
| 28 | 28 | if ( !$lockFile ) { |
| 29 | 29 | echo "Error opening lock file\n"; |
| 30 | 30 | exit( 1 ); |
| — | — | @@ -35,9 +35,9 @@ |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | // Update the files |
| 39 | | - svnUpdate( "$wgExtDistWorkingCopy/trunk" ); |
| 40 | | - for ( glob( "$wgExtDistWorkingCopy/branches/*", GLOB_ONLYDIR ) as $branch ) { |
| 41 | | - svnUpdate( $branch ); |
| | 39 | + svnUpdate( "$wgExtDistWorkingCopy/trunk/extensions" ); |
| | 40 | + foreach ( glob( "$wgExtDistWorkingCopy/branches/*", GLOB_ONLYDIR ) as $branch ) { |
| | 41 | + svnUpdate( "$branch/extensions" ); |
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
| Index: trunk/extensions/ExtensionDistributor/svn-invoker.php |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | if ( $wgExtDistLockFile ) { |
| 64 | | - $lockFile = fopen( $wgExtDistLockFile, 'r+' ); |
| | 64 | + $lockFile = fopen( $wgExtDistLockFile, 'a' ); |
| 65 | 65 | if ( !$lockFile ) { |
| 66 | 66 | svnError( 'extdist-remote-error', "Unable to open lock file." ); |
| 67 | 67 | return; |
| Property changes on: trunk/extensions/ExtensionDistributor |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 68 | 68 | Merged /branches/wmf/1.18wmf1/extensions/ExtensionDistributor:r102499 |