Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/114686

Change subject: Fix CDB file generation
......................................................................

Fix CDB file generation

- readWikiVersionsFile returns an associative array, not an array of arrays.
- readWikiVersionsFile should sort keys to make repeated runs on the same input
  deterministic.

Change-Id: Ic27cb9581a99cf18fc703b0d3d60e95a7bbc08a2
---
M multiversion/MWWikiversions.php
M multiversion/refreshWikiversionsCDB
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/86/114686/1

diff --git a/multiversion/MWWikiversions.php b/multiversion/MWWikiversions.php
index a4f3b08..2b77a18 100644
--- a/multiversion/MWWikiversions.php
+++ b/multiversion/MWWikiversions.php
@@ -20,6 +20,7 @@
                if ( !is_array( $verList ) || array_values( $verList ) === 
$verList ) {
                        throw new Exception( "$srcPath did not decode to an 
associative array.\n" );
                }
+               asort( $verList );
                return $verList;
        }
 
diff --git a/multiversion/refreshWikiversionsCDB 
b/multiversion/refreshWikiversionsCDB
index 7a5e041..3d8cfd9 100755
--- a/multiversion/refreshWikiversionsCDB
+++ b/multiversion/refreshWikiversionsCDB
@@ -52,8 +52,7 @@
                print "Unable to create {$tmpDBPath}.\n";
                exit( 1 );
        }
-       foreach ( $rows as $row ) {
-               list( $dbName, $version ) = $row;
+       foreach ( $rows as $dbName => $version ) {
                $db->set( "ver:$dbName", $version );
                $db->set( "ext:$dbName", '' );
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/114686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic27cb9581a99cf18fc703b0d3d60e95a7bbc08a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to