r102499 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r102498‎ | r102499 | r102500 >
Date:09:40, 9 November 2011
Author:tstarling
Status:ok
Tags:
Comment:
Fixed a couple of obvious errors from r102483 which came up during testing
Modified paths:
  • /branches/wmf/1.18wmf1/extensions/ExtensionDistributor/cron.php (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/ExtensionDistributor/svn-invoker.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/extensions/ExtensionDistributor/cron.php
@@ -21,9 +21,9 @@
2222 cronExecute();
2323
2424 function cronExecute() {
25 - global $wgExtDistLockFile;
 25+ global $wgExtDistWorkingCopy, $wgExtDistLockFile;
2626 if ( $wgExtDistLockFile ) {
27 - $lockFile = fopen( $wgExtDistLockFile, 'r+' );
 27+ $lockFile = fopen( $wgExtDistLockFile, 'a' );
2828 if ( !$lockFile ) {
2929 echo "Error opening lock file\n";
3030 exit( 1 );
@@ -35,9 +35,9 @@
3636 }
3737
3838 // 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" );
4242 }
4343 }
4444
Index: branches/wmf/1.18wmf1/extensions/ExtensionDistributor/svn-invoker.php
@@ -60,7 +60,7 @@
6161 }
6262
6363 if ( $wgExtDistLockFile ) {
64 - $lockFile = fopen( $wgExtDistLockFile, 'r+' );
 64+ $lockFile = fopen( $wgExtDistLockFile, 'a' );
6565 if ( !$lockFile ) {
6666 svnError( 'extdist-remote-error', "Unable to open lock file." );
6767 return;

Follow-up revisions

RevisionCommit summaryAuthorDate
r102500Merged r102499 from 1.18wmf1tstarling09:42, 9 November 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r102483MFT r102482tstarling02:44, 9 November 2011

Status & tagging log