*Fix bug when using Mediawiki updater command line.

*Prevent redeclaring wfWaitForSlaves ()

diff --git a/maintenance/populateCategory.inc b/maintenance/populateCategory.inc
index 905706e..497f4b5 100644 (file)
--- a/maintenance/populateCategory.inc
+++ b/maintenance/populateCategory.inc
@@ -4,6 +4,8 @@
  * @author Simetrical
  */
 
+require_once "commandLine.inc";
+
 define( 'REPORTING_INTERVAL', 1000 );
 
 function populateCategory( $begin, $maxlag, $throttle, $force ) {
@@ -82,19 +84,3 @@ function populateCategory( $begin, $maxlag, $throttle, $force ) {
                return false;
        }
 }
-
-function wfWaitForSlaves( $maxLag ) {
-       global $wgLoadBalancer;
-       if ( $maxLag ) {
-               list( $host, $lag ) = $wgLoadBalancer->getMaxLag();
-               while ( $lag > $maxLag ) {
-                       $name = @gethostbyaddr( $host );
-                       if ( $name !== false ) {
-                               $host = $name;
-                       }
-                       print "Waiting for $host (lagged $lag seconds)...\n";
-                       sleep($maxLag);
-                       list( $host, $lag ) = $wgLoadBalancer->getMaxLag();
-               }
-       }
-}