Aude has uploaded a new change for review.

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

Change subject: Update Wikidata - fix rdf dump script
......................................................................

Update Wikidata - fix rdf dump script

Change-Id: I512fe1615da0714572175aeb785ba85e4fc7d3c9
---
M composer.lock
M extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php
M vendor/composer/installed.json
3 files changed, 12 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/89/211689/1

diff --git a/composer.lock b/composer.lock
index 5252e5a..2762b02 100644
--- a/composer.lock
+++ b/composer.lock
@@ -867,7 +867,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wmde/Wikidata.org/zipball/58718af4a34d9fc067d9b103f0e5d9c9b9c87028";,
+                "url": 
"https://api.github.com/repos/wmde/Wikidata.org/zipball/2ce996a452942f27a1345b5446ca1a6e60c689ed";,
                 "reference": "58718af4a34d9fc067d9b103f0e5d9c9b9c87028",
                 "shasum": ""
             },
@@ -1213,7 +1213,7 @@
             "source": {
                 "type": "git",
                 "url": 
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
-                "reference": "1be5ea067d20ff52f8d55d4132736ed65af49588"
+                "reference": "9eabd536196d41b66b6921aa28c506c94960e4bc"
             },
             "require": {
                 "data-values/common": "~0.2.0",
@@ -1283,7 +1283,7 @@
                 "issues": "https://bugzilla.wikimedia.org/";,
                 "irc": "irc://irc.freenode.net/wikidata"
             },
-            "time": "2015-05-13 10:19:29"
+            "time": "2015-05-16 15:55:32"
         },
         {
             "name": "wikibase/wikimedia-badges",
@@ -1295,7 +1295,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wmde/WikimediaBadges/zipball/a4cb3fa96adee3f634999873c8bfe432783bf47e";,
+                "url": 
"https://api.github.com/repos/wmde/WikimediaBadges/zipball/8dfea8bb0afa937cdca0e33c24115d83f9b417cf";,
                 "reference": "a4cb3fa96adee3f634999873c8bfe432783bf47e",
                 "shasum": ""
             },
diff --git a/extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php 
b/extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php
index c44c9e7..5305eb6 100644
--- a/extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php
+++ b/extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php
@@ -98,6 +98,10 @@
                try {
                        $entityRevision = 
$this->entityRevisionLookup->getEntityRevision( $entityId );
 
+                       if ( !$entityRevision ) {
+                               throw new StorageException( 'Entity not found: 
' . $entityId->getSerialization() );
+                       }
+
                        $this->rdfBuilder->addEntityRevisionInfo(
                                $entityRevision->getEntity()->getId(),
                                $entityRevision->getRevisionId(),
@@ -108,9 +112,6 @@
                                $entityRevision->getEntity()
                        );
 
-                       if ( !$entityRevision ) {
-                               throw new StorageException( 'Entity not found: 
' . $entityId->getSerialization() );
-                       }
                } catch ( MWContentSerializationException $ex ) {
                        throw new StorageException( 'Deserialization error for 
' . $entityId->getSerialization() );
                } catch ( UnresolvedRedirectException $e ) {
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index d4aa7c3..76bdc00 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -154,7 +154,7 @@
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wmde/WikimediaBadges/zipball/a4cb3fa96adee3f634999873c8bfe432783bf47e";,
+            "url": 
"https://api.github.com/repos/wmde/WikimediaBadges/zipball/8dfea8bb0afa937cdca0e33c24115d83f9b417cf";,
             "reference": "a4cb3fa96adee3f634999873c8bfe432783bf47e",
             "shasum": ""
         },
@@ -206,7 +206,7 @@
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wmde/Wikidata.org/zipball/58718af4a34d9fc067d9b103f0e5d9c9b9c87028";,
+            "url": 
"https://api.github.com/repos/wmde/Wikidata.org/zipball/2ce996a452942f27a1345b5446ca1a6e60c689ed";,
             "reference": "58718af4a34d9fc067d9b103f0e5d9c9b9c87028",
             "shasum": ""
         },
@@ -1303,7 +1303,7 @@
         "source": {
             "type": "git",
             "url": 
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
-            "reference": "1be5ea067d20ff52f8d55d4132736ed65af49588"
+            "reference": "9eabd536196d41b66b6921aa28c506c94960e4bc"
         },
         "require": {
             "data-values/common": "~0.2.0",
@@ -1329,7 +1329,7 @@
         "conflict": {
             "mediawiki/mediawiki": "<1.23"
         },
-        "time": "2015-05-13 10:19:29",
+        "time": "2015-05-16 15:46:49",
         "type": "mediawiki-extension",
         "installation-source": "source",
         "autoload": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I512fe1615da0714572175aeb785ba85e4fc7d3c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.26wmf6
Gerrit-Owner: Aude <aude.w...@gmail.com>

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

Reply via email to