X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FrebuildImages.php;h=8e3997878ae63c0acf7f30d16f186cc478248c6d;hb=b3f9120af5fc883b38d5e7b55368ff61c2bbdd09;hp=8b0b05748c2e83873e8b67afe35b9042247e4312;hpb=eed31dbcd9f5ba292ba411094d6fbf86844ad726;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php
index 8b0b05748c..8e3997878a 100644
--- a/maintenance/rebuildImages.php
+++ b/maintenance/rebuildImages.php
@@ -59,7 +59,6 @@ class ImageBuilder extends Maintenance {
 
 	public function execute() {
 		$this->dbw = wfGetDB( DB_MASTER );
-		$this->maxLag = 10; # if slaves are lagged more than 10 secs, wait
 		$this->dryrun = $this->hasOption( 'dry-run' );
 		if ( $this->dryrun ) {
 			$GLOBALS['wgReadOnly'] = 'Dry run mode, image upgrades are suppressed';
@@ -79,6 +78,7 @@ class ImageBuilder extends Maintenance {
 		if ( !isset( $this->repo ) ) {
 			$this->repo = RepoGroup::singleton()->getLocalRepo();
 		}
+
 		return $this->repo;
 	}
 
@@ -149,6 +149,7 @@ class ImageBuilder extends Maintenance {
 		// Create a File object from the row
 		// This will also upgrade it
 		$file = $this->getRepo()->newFileFromRow( $row );
+
 		return $file->getUpgraded();
 	}
 
@@ -161,9 +162,11 @@ class ImageBuilder extends Maintenance {
 		// This will also upgrade it
 		if ( $row->oi_archive_name == '' ) {
 			$this->output( "Empty oi_archive_name for oi_name={$row->oi_name}\n" );
+
 			return false;
 		}
 		$file = $this->getRepo()->newFileFromRow( $row );
+
 		return $file->getUpgraded();
 	}
 
@@ -201,21 +204,22 @@ class ImageBuilder extends Maintenance {
 
 		if ( $filename == '' ) {
 			$this->output( "Empty filename for $fullpath\n" );
+
 			return;
 		}
 		if ( !$this->dryrun ) {
 			$file = wfLocalFile( $filename );
 			if ( !$file->recordUpload(
-					'',
-					'(recovered file, missing upload log entry)',
-					'',
-					'',
-					'',
-					false,
-					$timestamp
-				)
-			) {
+				'',
+				'(recovered file, missing upload log entry)',
+				'',
+				'',
+				'',
+				false,
+				$timestamp
+			) ) {
 				$this->output( "Error uploading file $fullpath\n" );
+
 				return;
 			}
 		}