jenkins-bot has submitted this change and it was merged.
Change subject: mw.FirefoggTransport: Don't swallow up exceptions about bad
Firefogg metadata
......................................................................
mw.FirefoggTransport: Don't swallow up exceptions about bad Firefogg metadata
The try...catch was not helping with anything, as various code later
expects that sourceFileInfo is set. We would just get more confusing
exceptions, instead of a sensible one about JSON being malformed.
After d5d25c111614835c173f284144169a8a8ccf43e9, this code should not
be executed for the problematic files anyway.
Change-Id: I95ab594a26665d56487df0bf84f5daff0681dd4d
---
M resources/transports/mw.FirefoggTransport.js
1 file changed, 2 insertions(+), 6 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/transports/mw.FirefoggTransport.js
b/resources/transports/mw.FirefoggTransport.js
index ea5ebd5..97ffb1c 100644
--- a/resources/transports/mw.FirefoggTransport.js
+++ b/resources/transports/mw.FirefoggTransport.js
@@ -121,14 +121,10 @@
*/
mw.FirefoggTransport.prototype.getSourceFileInfo = function () {
if ( !this.fogg.sourceInfo ) {
- mw.log.warn( 'No firefogg source info is available' );
- return false;
+ throw new Error( 'No Firefogg source info is available'
);
}
- try {
+ if ( !this.sourceFileInfo ) {
this.sourceFileInfo = JSON.parse( this.fogg.sourceInfo
);
- } catch ( e ) {
- mw.log.warn( 'Could not parse fogg sourceInfo' );
- return false;
}
return this.sourceFileInfo;
};
--
To view, visit https://gerrit.wikimedia.org/r/292790
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95ab594a26665d56487df0bf84f5daff0681dd4d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
